Show More
@@ -415,7 +415,13 b' class dirstate(object):' | |||||
415 | if self._pl[1] == nullid: |
|
415 | if self._pl[1] == nullid: | |
416 | raise util.Abort(_("setting %r to other parent " |
|
416 | raise util.Abort(_("setting %r to other parent " | |
417 | "only allowed in merges") % f) |
|
417 | "only allowed in merges") % f) | |
|
418 | if f in self and self[f] == 'n': | |||
|
419 | # merge-like | |||
|
420 | self._addpath(f, 'm', 0, -2, -1) | |||
|
421 | else: | |||
|
422 | # add-like | |||
418 | self._addpath(f, 'n', 0, -2, -1) |
|
423 | self._addpath(f, 'n', 0, -2, -1) | |
|
424 | ||||
419 | if f in self._copymap: |
|
425 | if f in self._copymap: | |
420 | del self._copymap[f] |
|
426 | del self._copymap[f] | |
421 |
|
427 |
@@ -66,11 +66,6 b' Merging:' | |||||
66 | $ echo 2b > baz |
|
66 | $ echo 2b > baz | |
67 | $ echo new > quux |
|
67 | $ echo new > quux | |
68 |
|
68 | |||
69 | We shouldn't have anything but foo in merge state here: |
|
|||
70 |
|
||||
71 | $ hg debugstate --nodates | grep "^m" |
|
|||
72 | m 644 3 foo |
|
|||
73 |
|
||||
74 | $ hg ci -m "merge" |
|
69 | $ hg ci -m "merge" | |
75 |
|
70 | |||
76 | main: we should have a merge here: |
|
71 | main: we should have a merge here: |
@@ -38,7 +38,7 b' revision.' | |||||
38 | (branch merge, don't forget to commit) |
|
38 | (branch merge, don't forget to commit) | |
39 |
|
39 | |||
40 | $ hg debugstate | grep foo |
|
40 | $ hg debugstate | grep foo | |
41 |
|
|
41 | m 0 -2 unset foo | |
42 |
|
42 | |||
43 | $ hg st -A foo |
|
43 | $ hg st -A foo | |
44 | M foo |
|
44 | M foo |
@@ -21,7 +21,7 b'' | |||||
21 | (branch merge, don't forget to commit) |
|
21 | (branch merge, don't forget to commit) | |
22 |
|
22 | |||
23 | $ hg debugstate --nodates |
|
23 | $ hg debugstate --nodates | |
24 |
|
|
24 | m 0 -2 bar | |
25 | m 644 14 foo1 |
|
25 | m 644 14 foo1 | |
26 | copy: foo -> foo1 |
|
26 | copy: foo -> foo1 | |
27 |
|
27 | |||
@@ -37,7 +37,7 b' Removing foo1 and bar:' | |||||
37 | $ hg rm -f foo1 bar |
|
37 | $ hg rm -f foo1 bar | |
38 |
|
38 | |||
39 | $ hg debugstate --nodates |
|
39 | $ hg debugstate --nodates | |
40 |
r 0 - |
|
40 | r 0 -1 bar | |
41 | r 0 -1 foo1 |
|
41 | r 0 -1 foo1 | |
42 | copy: foo -> foo1 |
|
42 | copy: foo -> foo1 | |
43 |
|
43 | |||
@@ -55,7 +55,7 b' Re-adding foo1 and bar:' | |||||
55 | adding foo1 |
|
55 | adding foo1 | |
56 |
|
56 | |||
57 | $ hg debugstate --nodates |
|
57 | $ hg debugstate --nodates | |
58 |
|
|
58 | m 644 5 bar | |
59 | m 644 14 foo1 |
|
59 | m 644 14 foo1 | |
60 | copy: foo -> foo1 |
|
60 | copy: foo -> foo1 | |
61 |
|
61 | |||
@@ -74,7 +74,7 b' Reverting foo1 and bar:' | |||||
74 | reverting foo1 |
|
74 | reverting foo1 | |
75 |
|
75 | |||
76 | $ hg debugstate --nodates |
|
76 | $ hg debugstate --nodates | |
77 |
|
|
77 | m 644 5 bar | |
78 | m 644 14 foo1 |
|
78 | m 644 14 foo1 | |
79 | copy: foo -> foo1 |
|
79 | copy: foo -> foo1 | |
80 |
|
80 |
General Comments 0
You need to be logged in to leave comments.
Login now