diff -r 69dae7982c85 -r 35729bdd59b6 tests/test-histedit-commute.out --- a/tests/test-histedit-commute.out Sat Jun 30 03:34:41 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,277 +0,0 @@ -% log before edit -@ changeset: 5:652413bf663e -| tag: tip -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: f -| -o changeset: 4:e860deea161a -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: e -| -o changeset: 3:055a42cdd887 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: d -| -o changeset: 2:177f92b77385 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: c -| -o changeset: 1:d2ae7f538514 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: b -| -o changeset: 0:cb9a9f314b8b - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: a - -% show the edit commands offered -pick 177f92b77385 2 c -pick 055a42cdd887 3 d -pick e860deea161a 4 e -pick 652413bf663e 5 f - -# Edit history between 177f92b77385 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 -% edit the history -0 files updated, 0 files merged, 3 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -% rules should end up in .hg/histedit-last-edit.txt: -pick 177f92b77385 c -pick e860deea161a e -pick 652413bf663e f -pick 055a42cdd887 d -**** end of rules file **** -% log after edit -@ changeset: 5:853c68da763f -| tag: tip -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: d -| -o changeset: 4:26f6a030ae82 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: f -| -o changeset: 3:b069cc29fb22 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: e -| -o changeset: 2:177f92b77385 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: c -| -o changeset: 1:d2ae7f538514 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: b -| -o changeset: 0:cb9a9f314b8b - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: a - -% put things back -0 files updated, 0 files merged, 3 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -@ changeset: 5:652413bf663e -| tag: tip -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: f -| -o changeset: 4:e860deea161a -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: e -| -o changeset: 3:055a42cdd887 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: d -| -o changeset: 2:177f92b77385 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: c -| -o changeset: 1:d2ae7f538514 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: b -| -o changeset: 0:cb9a9f314b8b - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: a - -% slightly different this time -0 files updated, 0 files merged, 4 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -@ changeset: 5:99a62755c625 -| tag: tip -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: c -| -o changeset: 4:7c6fdd608667 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: e -| -o changeset: 3:c4f52e213402 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: f -| -o changeset: 2:bfe4a5a76b37 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: d -| -o changeset: 1:d2ae7f538514 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: b -| -o changeset: 0:cb9a9f314b8b - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: a - -% keep prevents stripping dead revs -0 files updated, 0 files merged, 2 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -@ changeset: 7:99e266581538 -| tag: tip -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: e -| -o changeset: 6:5ad36efb0653 -| parent: 3:c4f52e213402 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: c -| -| o changeset: 5:99a62755c625 -| | user: test -| | date: Thu Jan 01 00:00:00 1970 +0000 -| | summary: c -| | -| o changeset: 4:7c6fdd608667 -|/ user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: e -| -o changeset: 3:c4f52e213402 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: f -| -o changeset: 2:bfe4a5a76b37 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: d -| -o changeset: 1:d2ae7f538514 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: b -| -o changeset: 0:cb9a9f314b8b - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: a - -% try with --rev -abort: may not use changesets other than the ones listed -@ changeset: 7:99e266581538 -| tag: tip -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: e -| -o changeset: 6:5ad36efb0653 -| parent: 3:c4f52e213402 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: c -| -| o changeset: 5:99a62755c625 -| | user: test -| | date: Thu Jan 01 00:00:00 1970 +0000 -| | summary: c -| | -| o changeset: 4:7c6fdd608667 -|/ user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: e -| -o changeset: 3:c4f52e213402 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: f -| -o changeset: 2:bfe4a5a76b37 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: d -| -o changeset: 1:d2ae7f538514 -| user: test -| date: Thu Jan 01 00:00:00 1970 +0000 -| summary: b -| -o changeset: 0:cb9a9f314b8b - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: a - -% should also work if a commit message is missing -adding changesets -adding manifests -adding file changes -added 3 changesets with 3 changes to 1 files -(run 'hg update' to get a working copy) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -@ changeset: 2:bd22688093b3 -| tag: tip -| user: Robert Altman -| date: Mon Nov 28 16:40:04 2011 +0000 -| summary: Update file. -| -o changeset: 1:3b3e956f9171 -| user: Robert Altman -| date: Mon Nov 28 16:37:57 2011 +0000 -| -o changeset: 0:141947992243 - user: Robert Altman - date: Mon Nov 28 16:35:28 2011 +0000 - summary: Checked in text file - -0 files updated, 0 files merged, 0 files removed, 0 files unresolved