-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathtestbzr.sh
More file actions
executable file
·75 lines (61 loc) · 1.67 KB
/
testbzr.sh
File metadata and controls
executable file
·75 lines (61 loc) · 1.67 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
#!/bin/sh
rm -R bzrtest*
mkdir bzrtest1
cd bzrtest1
bzr init
echo "normal" > normal.txt
echo "renamed" > renamed.txt
echo "modified" > modified.txt
echo "deleted" > deleted.txt
echo "exec" > exec.txt
echo "conflict" > conflict.txt
echo "conflict2" > conflict2.txt
mkdir normal-dir
mkdir renamed-dir
echo "subfile" > ./renamed-dir/subfile
mkdir modified-dir
mkdir deleted-dir
mkdir exec-dir
bzr add *
bzr commit -m "Initial commit"
# CHDIR and do a merge
cd ..
bzr branch bzrtest1 bzrtest2
# Make a change back in the original branch so we get a conflict
cd bzrtest1
echo "parent change" >> conflict.txt
echo "parent change" >> conflict2.txt
bzr commit -m "Parent change"
# CD back to the new branch and make a change
cd ../bzrtest2
echo "child change" >> conflict.txt
echo "child change" >> conflict2.txt
bzr commit -m "Child change"
bzr merge
# Add new file
# Add new directory
echo "new" > new.txt
mkdir new-dir
echo "new-dir-file" > ./new-dir/new-dir-file.txt
bzr add ./new.txt
bzr add ./new-dir
# Delete a file
# delete a directory
bzr rm deleted.txt
# Meld doesn't track this unless there's files below it....
bzr rm deleted-dir
# Rename a file
# Rename a directory
bzr mv renamed.txt renamed-new.txt
# bzr shows the directory as renamed, but not any subfiles. (different to git)
# Meld will not show the directory rename unless there are subfiles.
bzr mv renamed-dir renamed-new-dir
# Modify a file
echo "modified" >> modified.txt
# Modify a directory.... how?
# Change executable bit on file
# Change executable bit on a directory
chmod +x ./exec.txt
# Can't check this... if we -x on owner bzr can't status it anyway.
chmod g-x ./exec-dir
bzr mv ./conflict2.txt ./conflict2-moved.txt