equal
deleted
inserted
replaced
56 # letting the conflict resolving patch fix collisions. |
56 # letting the conflict resolving patch fix collisions. |
57 # Unfortunately, non-conflicting changes, like the addition of the |
57 # Unfortunately, non-conflicting changes, like the addition of the |
58 # "c" file in p1.1 patch are reverted too. |
58 # "c" file in p1.1 patch are reverted too. |
59 # Just to say that manifest not listing "c" here is a bug. |
59 # Just to say that manifest not listing "c" here is a bug. |
60 glog -R darcs-repo-hg |
60 glog -R darcs-repo-hg |
|
61 hg up -q -R darcs-repo-hg |
61 hg -R darcs-repo-hg manifest --debug |
62 hg -R darcs-repo-hg manifest --debug |