Show More
@@ -467,7 +467,8 b' def update(repo, node, branchmerge, forc' | |||||
467 | raise util.Abort(_("outstanding uncommitted merges")) |
|
467 | raise util.Abort(_("outstanding uncommitted merges")) | |
468 | if branchmerge: |
|
468 | if branchmerge: | |
469 | if pa == p2: |
|
469 | if pa == p2: | |
470 |
raise util.Abort(_(" |
|
470 | raise util.Abort(_("merging with a working directory ancestor" | |
|
471 | " has no effect")) | |||
471 | elif pa == p1: |
|
472 | elif pa == p1: | |
472 | if p1.branch() != p2.branch(): |
|
473 | if p1.branch() != p2.branch(): | |
473 | fastforward = True |
|
474 | fastforward = True |
@@ -6,5 +6,5 b' fast-forward' | |||||
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
7 | (branch merge, don't forget to commit) |
|
7 | (branch merge, don't forget to commit) | |
8 | bogus fast-forward should fail |
|
8 | bogus fast-forward should fail | |
9 | abort: can't merge with ancestor |
|
9 | abort: merging with a working directory ancestor has no effect | |
10 | done |
|
10 | done |
General Comments 0
You need to be logged in to leave comments.
Login now