Show More
@@ -459,7 +459,7 b' def histedit(ui, repo, *parent, **opts):' | |||||
459 | # contains special revset characters like ":" the revset |
|
459 | # contains special revset characters like ":" the revset | |
460 | # parser can choke. |
|
460 | # parser can choke. | |
461 | parent = [node.hex(n) for n in discovery.findcommonoutgoing( |
|
461 | parent = [node.hex(n) for n in discovery.findcommonoutgoing( | |
462 |
repo, other, |
|
462 | repo, other, revs, force=opts.get('force')).missing[0:1]] | |
463 | else: |
|
463 | else: | |
464 | if opts.get('force'): |
|
464 | if opts.get('force'): | |
465 | raise util.Abort(_('--force only allowed with --outgoing')) |
|
465 | raise util.Abort(_('--force only allowed with --outgoing')) |
@@ -82,3 +82,24 b' show the error from unrelated repos' | |||||
82 | # |
|
82 | # | |
83 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
83 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
84 | $ cd .. |
|
84 | $ cd .. | |
|
85 | ||||
|
86 | test sensitivity to branch in URL: | |||
|
87 | ||||
|
88 | $ cd r2 | |||
|
89 | $ hg -q update 2 | |||
|
90 | $ hg -q branch foo | |||
|
91 | $ hg commit -m 'create foo branch' | |||
|
92 | $ HGEDITOR=cat hg histedit --outgoing '../r#foo' | grep -v comparing | grep -v searching | |||
|
93 | pick f26599ee3441 6 create foo branch | |||
|
94 | ||||
|
95 | # Edit history between f26599ee3441 and f26599ee3441 | |||
|
96 | # | |||
|
97 | # Commands: | |||
|
98 | # p, pick = use commit | |||
|
99 | # e, edit = use commit, but stop for amending | |||
|
100 | # f, fold = use commit, but fold into previous commit (combines N and N-1) | |||
|
101 | # d, drop = remove commit from history | |||
|
102 | # m, mess = edit message without changing commit content | |||
|
103 | # | |||
|
104 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
105 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now