Show More
@@ -504,7 +504,6 b' def update(repo, node, branchmerge, forc' | |||||
504 | if branchmerge: |
|
504 | if branchmerge: | |
505 | if p1.branch() != p2.branch(): |
|
505 | if p1.branch() != p2.branch(): | |
506 | fastforward = True |
|
506 | fastforward = True | |
507 | branchmerge = False |
|
|||
508 | else: |
|
507 | else: | |
509 | raise util.Abort(_("there is nothing to merge, just use " |
|
508 | raise util.Abort(_("there is nothing to merge, just use " | |
510 | "'hg update' or look at 'hg heads'")) |
|
509 | "'hg update' or look at 'hg heads'")) |
@@ -95,9 +95,11 b' 0 files updated, 0 files merged, 1 files' | |||||
95 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
95 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
96 | (branch merge, don't forget to commit) |
|
96 | (branch merge, don't forget to commit) | |
97 | foo |
|
97 | foo | |
98 |
changeset: 6: |
|
98 | changeset: 6:f0c74f92a385 | |
99 | branch: foo |
|
99 | branch: foo | |
100 | tag: tip |
|
100 | tag: tip | |
|
101 | parent: 4:4909a3732169 | |||
|
102 | parent: 5:c420d2121b71 | |||
101 | user: test |
|
103 | user: test | |
102 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
104 | date: Mon Jan 12 13:46:40 1970 +0000 | |
103 | summary: Merge ff into foo |
|
105 | summary: Merge ff into foo |
General Comments 0
You need to be logged in to leave comments.
Login now