diff options
author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
---|---|---|
committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
commit | 4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch) | |
tree | 75f4c36771caf222280249cd1ed611d5ade8bd48 /tests/test-histedit-outgoing.t | |
parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
download | mercurial-tarball-baserock/morph.tar.gz |
Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph
This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.
We also undo the setup.py change because python now supports bz2
Diffstat (limited to 'tests/test-histedit-outgoing.t')
-rw-r--r-- | tests/test-histedit-outgoing.t | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/tests/test-histedit-outgoing.t b/tests/test-histedit-outgoing.t deleted file mode 100644 index 8025891..0000000 --- a/tests/test-histedit-outgoing.t +++ /dev/null @@ -1,84 +0,0 @@ - $ cat >> $HGRCPATH <<EOF - > [extensions] - > graphlog= - > histedit= - > EOF - - $ initrepos () - > { - > hg init r - > cd r - > for x in a b c ; do - > echo $x > $x - > hg add $x - > hg ci -m $x - > done - > cd .. - > hg clone r r2 | grep -v updating - > cd r2 - > for x in d e f ; do - > echo $x > $x - > hg add $x - > hg ci -m $x - > done - > cd .. - > hg init r3 - > cd r3 - > for x in g h i ; do - > echo $x > $x - > hg add $x - > hg ci -m $x - > done - > cd .. - > } - - $ initrepos - 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - -show the edit commands offered by outgoing - $ cd r2 - $ HGEDITOR=cat hg histedit --outgoing ../r | grep -v comparing | grep -v searching - pick 055a42cdd887 3 d - pick e860deea161a 4 e - pick 652413bf663e 5 f - - # Edit history between 055a42cdd887 and 652413bf663e - # - # Commands: - # p, pick = use commit - # e, edit = use commit, but stop for amending - # f, fold = use commit, but fold into previous commit (combines N and N-1) - # d, drop = remove commit from history - # m, mess = edit message without changing commit content - # - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd .. - -show the error from unrelated repos - $ cd r3 - $ HGEDITOR=cat hg histedit --outgoing ../r | grep -v comparing | grep -v searching - abort: repository is unrelated - [1] - $ cd .. - -show the error from unrelated repos - $ cd r3 - $ HGEDITOR=cat hg histedit --force --outgoing ../r - comparing with ../r - searching for changes - warning: repository is unrelated - pick 2a4042b45417 0 g - pick 68c46b4927ce 1 h - pick 51281e65ba79 2 i - - # Edit history between 2a4042b45417 and 51281e65ba79 - # - # Commands: - # p, pick = use commit - # e, edit = use commit, but stop for amending - # f, fold = use commit, but fold into previous commit (combines N and N-1) - # d, drop = remove commit from history - # m, mess = edit message without changing commit content - # - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ cd .. |