equal
deleted
inserted
replaced
121 hg rollback |
121 hg rollback |
122 hg update -C |
122 hg update -C |
123 |
123 |
124 hg backout -d '6 0' --parent 3 4 |
124 hg backout -d '6 0' --parent 3 4 |
125 |
125 |
|
126 cd .. |
|
127 |
|
128 echo '# named branches' |
|
129 |
|
130 hg init named_branches |
|
131 cd named_branches |
|
132 |
|
133 echo default > default |
|
134 hg ci -d '0 0' -Am default |
|
135 hg branch branch1 |
|
136 echo branch1 > file1 |
|
137 hg ci -d '1 0' -Am file1 |
|
138 hg branch branch2 |
|
139 echo branch2 > file2 |
|
140 hg ci -d '2 0' -Am file2 |
|
141 hg backout -d '3 0' -r 1 -m 'backout on branch1' |
|
142 # XXX maybe backout shouldn't suggest a merge here as it is a different branch? |
|
143 |
|
144 echo '% on branch2 with branch1 not merged, so file1 should still exist:' |
|
145 hg id |
|
146 hg st -A |
|
147 |
|
148 echo '% on branch2 with branch1 merged, so file1 should be gone:' |
|
149 hg merge |
|
150 hg ci -d '4 0' -m 'merge backout of branch1' |
|
151 hg id |
|
152 hg st -A |
|
153 |
|
154 echo '% on branch1, so no file1 and file2:' |
|
155 hg co -C branch1 |
|
156 hg id |
|
157 hg st -A |
|
158 |
126 exit 0 |
159 exit 0 |