Job hg-committed-c23877cb25a5c7ecc8e61bf9b8d17fb5ab68fd34-windows-cpython-2.7-x64-0

Failed Tests

• test-commit-amend.t
• test-obsolete.t
• test-push-race.t#unrelated

test-commit-amend.t

--- c:/hgdev/src/tests/test-commit-amend.t
+++ c:/hgdev/src/tests/test-commit-amend.t.err
@@ -173,13 +173,15 @@
   saved backup bundle to $TESTTMP/.hg/strip-backup/401431e913a1-5e8e532c-amend.hg
   $ echo a >> a
   $ hg ci --amend -u foo -d '1 0'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/d96b1d28ae33-677e0afb-amend.hg
+  warning: ignoring unknown working parent d96b1d28ae33!
+  abort: cannot amend null changeset
+  (no changeset checked out)
+  [255]
   $ hg log -r .
-  changeset:   1:a9a13940fc03
-  tag:         tip
-  user:        foo
-  date:        Thu Jan 01 00:00:01 1970 +0000
-  summary:     no changes, new message
+  warning: ignoring unknown working parent d96b1d28ae33!
+  changeset:   -1:000000000000
+  user:        
+  date:        Thu Jan 01 00:00:00 1970 +0000
   
 
 Open editor with old commit message if a message isn't given otherwise:
@@ -199,45 +201,24 @@
 
   $ rm -f .hg/last-message.txt
   $ hg commit --amend -v -m "message given from command line"
-  amending changeset a9a13940fc03
-  copying changeset a9a13940fc03 to ad120869acf0
-  committing files:
-  a
-  committing manifest
-  committing changelog
-  running hook pretxncommit.test-saving-last-message: false
-  transaction abort!
-  rollback completed
-  abort: pretxncommit.test-saving-last-message hook exited with status 1
+  warning: ignoring unknown working parent d96b1d28ae33!
+  abort: cannot amend null changeset
+  (no changeset checked out)
   [255]
   $ cat .hg/last-message.txt
-  message given from command line (no-eol)
+  cat: .hg/last-message.txt: $ENOENT$
+  [1]
 
   $ rm -f .hg/last-message.txt
   $ HGEDITOR=""sh" "`pwd`/editor.sh"" hg commit --amend -v
-  amending changeset a9a13940fc03
-  copying changeset a9a13940fc03 to ad120869acf0
-  no changes, new message
-  
-  
-  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
-  HG: Leave message empty to abort commit.
-  HG: --
-  HG: user: foo
-  HG: branch 'default'
-  HG: changed a
-  committing files:
-  a
-  committing manifest
-  committing changelog
-  running hook pretxncommit.test-saving-last-message: false
-  transaction abort!
-  rollback completed
-  abort: pretxncommit.test-saving-last-message hook exited with status 1
+  warning: ignoring unknown working parent d96b1d28ae33!
+  abort: cannot amend null changeset
+  (no changeset checked out)
   [255]
 
   $ cat .hg/last-message.txt
-  another precious commit message
+  cat: .hg/last-message.txt: $ENOENT$
+  [1]
 
   $ cat > .hg/hgrc << '__EOF__'
   > [hooks]
@@ -247,99 +228,53 @@
 then, test editing custom commit message
 
   $ HGEDITOR=""sh" "`pwd`/editor.sh"" hg commit --amend -v
-  amending changeset a9a13940fc03
-  copying changeset a9a13940fc03 to ad120869acf0
-  no changes, new message
-  
-  
-  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
-  HG: Leave message empty to abort commit.
-  HG: --
-  HG: user: foo
-  HG: branch 'default'
-  HG: changed a
-  committing files:
-  a
-  committing manifest
-  committing changelog
-  1 changesets found
-  uncompressed size of bundle content:
-       249 (changelog)
-       163 (manifests)
-       133  a
-  saved backup bundle to $TESTTMP/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg
-  1 changesets found
-  uncompressed size of bundle content:
-       257 (changelog)
-       163 (manifests)
-       133  a
-  adding branch
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
-  committed changeset 1:64a124ba1b44
+  warning: ignoring unknown working parent d96b1d28ae33!
+  abort: cannot amend null changeset
+  (no changeset checked out)
+  [255]
 
 Same, but with changes in working dir (different code path):
 
   $ echo a >> a
   $ HGEDITOR=""sh" "`pwd`/editor.sh"" hg commit --amend -v
-  amending changeset 64a124ba1b44
-  another precious commit message
-  
-  
-  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
-  HG: Leave message empty to abort commit.
-  HG: --
-  HG: user: foo
-  HG: branch 'default'
-  HG: changed a
-  committing files:
-  a
-  committing manifest
-  committing changelog
-  1 changesets found
-  uncompressed size of bundle content:
-       257 (changelog)
-       163 (manifests)
-       133  a
-  saved backup bundle to $TESTTMP/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg
-  1 changesets found
-  uncompressed size of bundle content:
-       257 (changelog)
-       163 (manifests)
-       135  a
-  adding branch
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files
-  committed changeset 1:7892795b8e38
+  warning: ignoring unknown working parent d96b1d28ae33!
+  abort: cannot amend null changeset
+  (no changeset checked out)
+  [255]
 
   $ rm editor.sh
   $ hg log -r .
-  changeset:   1:7892795b8e38
-  tag:         tip
-  user:        foo
-  date:        Thu Jan 01 00:00:01 1970 +0000
-  summary:     another precious commit message
+  warning: ignoring unknown working parent d96b1d28ae33!
+  changeset:   -1:000000000000
+  user:        
+  date:        Thu Jan 01 00:00:00 1970 +0000
   
 
 Moving bookmarks, preserve active bookmark:
 
   $ hg book book1
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg book book2
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg ci --amend -m 'move bookmarks'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/7892795b8e38-3fb46217-amend.hg
+  warning: ignoring unknown working parent d96b1d28ae33!
+  abort: cannot amend null changeset
+  (no changeset checked out)
+  [255]
   $ hg book
-     book1                     1:8311f17e2616
-   * book2                     1:8311f17e2616
+  no bookmarks set
   $ echo a >> a
   $ hg ci --amend -m 'move bookmarks'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/8311f17e2616-f0504fe3-amend.hg
+  warning: ignoring unknown working parent d96b1d28ae33!
+  abort: cannot amend null changeset
+  (no changeset checked out)
+  [255]
   $ hg book
-     book1                     1:a3b65065808c
-   * book2                     1:a3b65065808c
+  no bookmarks set
 
 abort does not loose bookmarks
 
@@ -349,12 +284,16 @@
   > __EOF__
   $ echo a >> a
   $ HGEDITOR=""sh" "`pwd`/editor.sh"" hg commit --amend
-  abort: empty commit message
+  warning: ignoring unknown working parent d96b1d28ae33!
+  abort: cannot amend null changeset
+  (no changeset checked out)
   [255]
   $ hg book
-     book1                     1:a3b65065808c
-   * book2                     1:a3b65065808c
+  no bookmarks set
   $ hg revert -Caq
+  warning: ignoring unknown working parent d96b1d28ae33!
+  abort: a@000000000000: not found in manifest!
+  [255]
   $ rm editor.sh
 
   $ echo '[defaults]' >> $HGRCPATH
@@ -367,62 +306,91 @@
   (branches are permanent and global, did you want a bookmark?)
   $ echo a >> a
   $ hg ci -m 'branch foo'
+  warning: ignoring unknown working parent d96b1d28ae33!
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg branch default -f
   marked working directory as branch default
+  (branches are permanent and global, did you want a bookmark?)
   $ hg ci --amend -m 'back to default'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/f8339a38efe1-c18453c9-amend.hg
+  warning: ignoring unknown working parent d96b1d28ae33!
+  abort: cannot amend null changeset
+  (no changeset checked out)
+  [255]
   $ hg branches
-  default                        2:9c07515f2650
+  warning: ignoring unknown working parent d96b1d28ae33!
+  default                        0:ad120869acf0
 
 Close branch:
 
   $ hg up -q 0
+  warning: ignoring unknown working parent d96b1d28ae33!
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
+  [1]
   $ echo b >> b
   $ hg branch foo
   marked working directory as branch foo
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Am 'fork'
+  adding a.orig
   adding b
+  abort: unresolved merge conflicts (see 'hg help resolve')
+  [255]
   $ echo b >> b
   $ hg ci -mb
+  abort: unresolved merge conflicts (see 'hg help resolve')
+  [255]
   $ hg ci --amend --close-branch -m 'closing branch foo'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-54245dc7-amend.hg
+  abort: branch "foo" has no heads to close
+  [255]
 
 Same thing, different code path:
 
   $ echo b >> b
   $ hg ci -m 'reopen branch'
-  reopening closed branch head 4
+  abort: unresolved merge conflicts (see 'hg help resolve')
+  [255]
   $ echo b >> b
   $ hg ci --amend --close-branch
-  saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-b900d9fa-amend.hg
+  abort: branch "foo" has no heads to close
+  [255]
   $ hg branches
-  default                        2:9c07515f2650
+  default                        0:ad120869acf0
 
 Refuse to amend during a merge:
 
   $ hg up -q default
+  abort: outstanding merge conflicts
+  (use 'hg resolve' to resolve)
+  [255]
   $ hg merge foo
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
+  abort: unknown revision 'foo'!
+  [255]
   $ hg ci --amend
-  abort: cannot amend while merging
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
   [255]
   $ hg ci -m 'merge'
+  abort: unresolved merge conflicts (see 'hg help resolve')
+  [255]
 
 Refuse to amend if there is a merge conflict (issue5805):
 
   $ hg up -q foo
+  abort: unknown revision 'foo'!
+  [255]
   $ echo c > a
   $ hg up default -t :fail
-  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges
-  [1]
+  abort: outstanding merge conflicts
+  (use 'hg resolve' to resolve)
+  [255]
   $ hg resolve -l
   U a
 
   $ hg ci --amend
-  abort: unresolved merge conflicts (see 'hg help resolve')
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
   [255]
 
   $ hg up -qC .
@@ -430,30 +398,61 @@
 Follow copies/renames:
 
   $ hg mv b c
+  b: not copying - file is not managed
+  abort: no files to copy
+  [255]
   $ hg ci -m 'b -> c'
+  nothing changed
+  [1]
   $ hg mv c d
+  c: $ENOENT$
+  abort: no files to copy
+  [255]
   $ hg ci --amend -m 'b -> d'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/42f3f27a067d-f23cc9f7-amend.hg
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg st --rev '.^' --copies d
-  A d
-    b
+  abort: empty revision range
+  [255]
   $ hg cp d e
+  d: $ENOENT$
+  abort: no files to copy
+  [255]
   $ hg ci -m 'e = d'
+  nothing changed
+  [1]
   $ hg cp e f
+  e: $ENOENT$
+  abort: no files to copy
+  [255]
   $ hg ci --amend -m 'f = d'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/9198f73182d5-251d584a-amend.hg
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg st --rev '.^' --copies f
-  A f
-    d
+  abort: empty revision range
+  [255]
 
   $ mv f f.orig
+  mv: cannot stat `f': $ENOENT$
+  [1]
   $ hg rm -A f
+  f: $ENOENT$
+  [1]
   $ hg ci -m removef
+  nothing changed
+  [1]
   $ hg cp a f
   $ mv f.orig f
+  mv: cannot stat `f.orig': $ENOENT$
+  [1]
   $ hg ci --amend -m replacef
-  saved backup bundle to $TESTTMP/.hg/strip-backup/f0993ab6b482-eda301bf-amend.hg
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg st --change . --copies
+  A a
   $ hg log -r . --template "{file_copies}
"
   
 
@@ -461,20 +460,28 @@
 
   $ echo g >> g
   $ hg ci -Am g
+  adding a.orig
+  adding b
   adding g
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg mv g h
+  g: not copying - file is not managed
+  abort: no files to copy
+  [255]
   $ hg ci --amend
-  saved backup bundle to $TESTTMP/.hg/strip-backup/58585e3f095c-0f5ebcda-amend.hg
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg st --change . --copies h
-  A h
   $ hg log -r . --template "{file_copies}
"
   
 
 Can't rollback an amend:
 
   $ hg rollback
-  no rollback information available
-  [1]
+  repository tip rolled back to revision 2 (undo strip)
 
 Preserve extra dict (issue3430):
 
@@ -483,14 +490,21 @@
   (branches are permanent and global, did you want a bookmark?)
   $ echo a >> a
   $ hg ci -ma
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg ci --amend -m "a'"
-  saved backup bundle to $TESTTMP/.hg/strip-backup/39a162f1d65e-9dfe13d8-amend.hg
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log -r . --template "{branch}
"
-  a
+  default
   $ hg ci --amend -m "a''"
-  saved backup bundle to $TESTTMP/.hg/strip-backup/d5ca7b1ac72b-0b4c1a34-amend.hg
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log -r . --template "{branch}
"
-  a
+  default
 
 Also preserve other entries in the dict that are in the old commit,
 first graft something so there's an additional entry:
@@ -498,32 +512,39 @@
   $ hg up 0 -q
   $ echo z > z
   $ hg ci -Am 'fork'
+  adding a.orig
+  adding b
+  adding g
   adding z
-  created new head
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg up 11
-  5 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  abort: unknown revision '11'!
+  [255]
   $ hg graft 12
-  grafting 12:2647734878ef "fork" (tip)
+  abort: uncommitted changes
+  [255]
   $ hg ci --amend -m 'graft amend'
-  saved backup bundle to $TESTTMP/.hg/strip-backup/fe8c6f7957ca-25638666-amend.hg
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log -r . --debug | grep extra
-  extra:       amend_source=fe8c6f7957ca1665ed77496ed7a07657d469ac60
-  extra:       branch=a
-  extra:       source=2647734878ef0236dda712fae9c1651cf694ea8a
+  extra:       branch=default
 
 Preserve phase
 
   $ hg phase '.^::.'
-  11: draft
-  13: draft
   $ hg phase --secret --force .
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg phase '.^::.'
-  11: draft
-  13: secret
   $ hg commit --amend -m 'amend for phase' -q
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg phase '.^::.'
-  11: draft
-  13: secret
 
 Test amend with obsolete
 ---------------------------
@@ -539,33 +560,21 @@
 Amend with no files changes
 
   $ hg id -n
-  13
+  0+
   $ hg ci --amend -m 'babar'
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg id -n
-  14
+  0+
   $ hg log -Gl 3 --style=compact
-  @  14[tip]:11   682950e85999   1970-01-01 00:00 +0000   test
-  |    babar
-  |
-  | o  12:0   2647734878ef   1970-01-01 00:00 +0000   test
-  | |    fork
-  | ~
-  o  11   0ddb275cfad1   1970-01-01 00:00 +0000   test
-  |    a''
-  ~
+  @  0[tip]   ad120869acf0   1970-01-01 00:00 +0000   test
+       base
+  
   $ hg log -Gl 4 --hidden --style=compact
-  @  14[tip]:11   682950e85999   1970-01-01 00:00 +0000   test
-  |    babar
-  |
-  | x  13:11   5167600b0f7a   1970-01-01 00:00 +0000   test
-  |/     amend for phase
-  |
-  | o  12:0   2647734878ef   1970-01-01 00:00 +0000   test
-  | |    fork
-  | ~
-  o  11   0ddb275cfad1   1970-01-01 00:00 +0000   test
-  |    a''
-  ~
+  @  0[tip]   ad120869acf0   1970-01-01 00:00 +0000   test
+       base
+  
 
 Amend with files changes
 
@@ -574,59 +583,44 @@
 
   $ echo 'babar' >> a
   $ hg commit --amend
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log -Gl 6 --hidden --style=compact
-  @  15[tip]:11   a5b42b49b0d5   1970-01-01 00:00 +0000   test
-  |    babar
-  |
-  | x  14:11   682950e85999   1970-01-01 00:00 +0000   test
-  |/     babar
-  |
-  | x  13:11   5167600b0f7a   1970-01-01 00:00 +0000   test
-  |/     amend for phase
-  |
-  | o  12:0   2647734878ef   1970-01-01 00:00 +0000   test
-  | |    fork
-  | ~
-  o  11   0ddb275cfad1   1970-01-01 00:00 +0000   test
-  |    a''
-  |
-  o  10   5fa75032e226   1970-01-01 00:00 +0000   test
-  |    g
-  ~
+  @  0[tip]   ad120869acf0   1970-01-01 00:00 +0000   test
+       base
+  
 
 
 Test that amend does not make it easy to create obsolescence cycle
 ---------------------------------------------------------------------
 
   $ hg id -r 14 --hidden
-  682950e85999 (a)
+  abort: unknown revision '14'!
+  [255]
   $ hg revert -ar 14 --hidden
-  reverting a
+  abort: unknown revision '14'!
+  [255]
   $ hg commit --amend
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg id
-  37973c7e0b61 (a) tip
+  ad120869acf0+ (a) tip
 
 Test that rewriting leaving instability behind is allowed
 ---------------------------------------------------------------------
 
   $ hg up '.^'
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  abort: empty revision set
+  [255]
   $ echo 'b' >> a
   $ hg log --style compact -r 'children(.)'
-  16[tip]:11   37973c7e0b61   1970-01-01 00:00 +0000   test
-    babar
-  
   $ hg commit --amend
-  1 new orphan changesets
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log -r 'orphan()'
-  changeset:   16:37973c7e0b61
-  branch:      a
-  parent:      11:0ddb275cfad1
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  instability: orphan
-  summary:     babar
-  
 
 Amend a merge changeset (with renames and conflicts from the second parent):
 
@@ -634,244 +628,236 @@
   $ hg branch -q bar
   $ hg cp a aa
   $ hg mv z zz
+  z: not copying - file is not managed
+  abort: no files to copy
+  [255]
   $ echo cc > cc
   $ hg add cc
   $ hg ci -m aazzcc
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg up -q default
   $ echo a >> a
   $ echo dd > cc
   $ hg add cc
+  cc already tracked!
   $ hg ci -m aa
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg merge -q bar
-  warning: conflicts while merging cc! (edit, then use 'hg resolve --mark')
-  [1]
+  abort: unknown revision 'bar'!
+  [255]
   $ hg resolve -m cc
-  (no more unresolved files)
+  abort: resolve command not applicable when not merging
+  [255]
   $ hg ci -m 'merge bar'
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log --config diff.git=1 -pr .
-  changeset:   20:5aba7f3726e6
+  changeset:   0:ad120869acf0
   tag:         tip
-  parent:      19:30d96aeaf27b
-  parent:      18:1aa437659d19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     merge bar
-  
-  diff --git a/a b/aa
-  copy from a
-  copy to aa
-  diff --git a/cc b/cc
-  --- a/cc
-  +++ b/cc
-  @@ -1,1 +1,5 @@
-  +<<<<<<< working copy: 30d96aeaf27b - test: aa
-   dd
-  +=======
-  +cc
-  +>>>>>>> merge rev:    1aa437659d19 bar - test: aazzcc
-  diff --git a/z b/zz
-  rename from z
-  rename to zz
+  summary:     base
+  
+  diff --git a/a b/a
+  new file mode 100644
+  --- /dev/null
+  +++ b/a
+  @@ -0,0 +1,1 @@
+  +a
   
   $ hg debugrename aa
-  aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
+  aa: no such file in rev ad120869acf0
   $ hg debugrename zz
-  zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a
+  zz: no such file in rev ad120869acf0
   $ hg debugrename cc
-  cc not renamed
+  cc: no such file in rev ad120869acf0
   $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -m 'merge bar (amend message)' --edit
-  HGEDITFORM=commit.amend.merge
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log --config diff.git=1 -pr .
-  changeset:   21:4b0631ef043e
+  changeset:   0:ad120869acf0
   tag:         tip
-  parent:      19:30d96aeaf27b
-  parent:      18:1aa437659d19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     merge bar (amend message)
-  
-  diff --git a/a b/aa
-  copy from a
-  copy to aa
-  diff --git a/cc b/cc
-  --- a/cc
-  +++ b/cc
-  @@ -1,1 +1,5 @@
-  +<<<<<<< working copy: 30d96aeaf27b - test: aa
-   dd
-  +=======
-  +cc
-  +>>>>>>> merge rev:    1aa437659d19 bar - test: aazzcc
-  diff --git a/z b/zz
-  rename from z
-  rename to zz
+  summary:     base
+  
+  diff --git a/a b/a
+  new file mode 100644
+  --- /dev/null
+  +++ b/a
+  @@ -0,0 +1,1 @@
+  +a
   
   $ hg debugrename aa
-  aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
+  aa: no such file in rev ad120869acf0
   $ hg debugrename zz
-  zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a
+  zz: no such file in rev ad120869acf0
   $ hg debugrename cc
-  cc not renamed
+  cc: no such file in rev ad120869acf0
   $ hg mv zz z
+  zz: $ENOENT$
+  abort: no files to copy
+  [255]
   $ hg ci --amend -m 'merge bar (undo rename)'
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log --config diff.git=1 -pr .
-  changeset:   22:06423be42d60
+  changeset:   0:ad120869acf0
   tag:         tip
-  parent:      19:30d96aeaf27b
-  parent:      18:1aa437659d19
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     merge bar (undo rename)
-  
-  diff --git a/a b/aa
-  copy from a
-  copy to aa
-  diff --git a/cc b/cc
-  --- a/cc
-  +++ b/cc
-  @@ -1,1 +1,5 @@
-  +<<<<<<< working copy: 30d96aeaf27b - test: aa
-   dd
-  +=======
-  +cc
-  +>>>>>>> merge rev:    1aa437659d19 bar - test: aazzcc
+  summary:     base
+  
+  diff --git a/a b/a
+  new file mode 100644
+  --- /dev/null
+  +++ b/a
+  @@ -0,0 +1,1 @@
+  +a
   
   $ hg debugrename z
-  z not renamed
+  z: no such file in rev ad120869acf0
 
 Amend a merge changeset (with renames during the merge):
 
   $ hg up -q bar
+  abort: unknown revision 'bar'!
+  [255]
   $ echo x > x
   $ hg add x
   $ hg ci -m x
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg up -q default
   $ hg merge -q bar
+  abort: unknown revision 'bar'!
+  [255]
   $ hg mv aa aaa
   $ echo aa >> aaa
   $ hg ci -m 'merge bar again'
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log --config diff.git=1 -pr .
-  changeset:   24:a89974a20457
+  changeset:   0:ad120869acf0
   tag:         tip
-  parent:      22:06423be42d60
-  parent:      23:4c94d5bc65f5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     merge bar again
-  
-  diff --git a/aa b/aa
-  deleted file mode 100644
-  --- a/aa
-  +++ /dev/null
-  @@ -1,2 +0,0 @@
-  -a
-  -a
-  diff --git a/aaa b/aaa
-  new file mode 100644
-  --- /dev/null
-  +++ b/aaa
-  @@ -0,0 +1,3 @@
-  +a
-  +a
-  +aa
-  diff --git a/x b/x
-  new file mode 100644
-  --- /dev/null
-  +++ b/x
+  summary:     base
+  
+  diff --git a/a b/a
+  new file mode 100644
+  --- /dev/null
+  +++ b/a
   @@ -0,0 +1,1 @@
-  +x
+  +a
   
   $ hg debugrename aaa
-  aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980
+  aaa: no such file in rev ad120869acf0
 
 Update to p1 with 'aaa' modified. 'aaa' was renamed from 'aa' in p2. 'aa' exists
 in p1 too, but it was recorded as copied from p2.
   $ echo modified >> aaa
   $ hg co -m '.^' -t :merge3
-  file 'aaa' was deleted in other [destination] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? u
-  1 files updated, 0 files merged, 1 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges
-  [1]
+  abort: empty revision set
+  [255]
   $ hg co -C tip
-  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg mv aaa aa
+  aaa: not copying - file is not managed
+  abort: no files to copy
+  [255]
   $ hg ci --amend -m 'merge bar again (undo rename)'
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log --config diff.git=1 -pr .
-  changeset:   25:282080768800
+  changeset:   0:ad120869acf0
   tag:         tip
-  parent:      22:06423be42d60
-  parent:      23:4c94d5bc65f5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     merge bar again (undo rename)
-  
-  diff --git a/aa b/aa
-  --- a/aa
-  +++ b/aa
-  @@ -1,2 +1,3 @@
-   a
-   a
-  +aa
-  diff --git a/x b/x
-  new file mode 100644
-  --- /dev/null
-  +++ b/x
+  summary:     base
+  
+  diff --git a/a b/a
+  new file mode 100644
+  --- /dev/null
+  +++ b/a
   @@ -0,0 +1,1 @@
-  +x
+  +a
   
   $ hg debugrename aa
-  aa not renamed
+  aa: no such file in rev ad120869acf0
   $ hg debugrename -r '.^' aa
-  aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e
+  abort: empty revision set
+  [255]
 
 Amend a merge changeset (with manifest-level conflicts):
 
   $ hg up -q bar
+  abort: unknown revision 'bar'!
+  [255]
   $ hg rm aa
+  aa: $ENOENT$
+  [1]
   $ hg ci -m 'rm aa'
+  nothing changed
+  [1]
   $ hg up -q default
   $ echo aa >> aa
   $ hg ci -m aa
+  nothing changed
+  [1]
   $ hg merge -q bar --config ui.interactive=True << EOF
   > c
   > EOF
-  file 'aa' was deleted in other [merge rev] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? c
+  abort: unknown revision 'bar'!
+  [255]
   $ hg ci -m 'merge bar (with conflicts)'
+  nothing changed
+  [1]
   $ hg log --config diff.git=1 -pr .
-  changeset:   28:ed15db12298d
+  changeset:   0:ad120869acf0
   tag:         tip
-  parent:      27:eb5adec0b43b
-  parent:      26:67db8847a540
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     merge bar (with conflicts)
-  
+  summary:     base
+  
+  diff --git a/a b/a
+  new file mode 100644
+  --- /dev/null
+  +++ b/a
+  @@ -0,0 +1,1 @@
+  +a
   
   $ hg rm aa
+  not removing aa: file is untracked
+  [1]
   $ hg ci --amend -m 'merge bar (with conflicts, amended)'
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg log --config diff.git=1 -pr .
-  changeset:   29:0eeafd043f63
+  changeset:   0:ad120869acf0
   tag:         tip
-  parent:      27:eb5adec0b43b
-  parent:      26:67db8847a540
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  summary:     merge bar (with conflicts, amended)
-  
-  diff --git a/aa b/aa
-  deleted file mode 100644
-  --- a/aa
-  +++ /dev/null
-  @@ -1,4 +0,0 @@
-  -a
-  -a
-  -aa
-  -aa
+  summary:     base
+  
+  diff --git a/a b/a
+  new file mode 100644
+  --- /dev/null
+  +++ b/a
+  @@ -0,0 +1,1 @@
+  +a
   
 Issue 3445: amending with --close-branch a commit that created a new head should fail
 This shouldn't be possible:
@@ -879,17 +865,22 @@
   $ hg up -q default
   $ hg branch closewithamend
   marked working directory as branch closewithamend
+  (branches are permanent and global, did you want a bookmark?)
   $ echo foo > foo
   $ hg add foo
   $ hg ci -m..
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg ci --amend --close-branch -m 'closing'
-  abort: can only close branch heads
+  abort: branch "closewithamend" has no heads to close
   [255]
 
 This silliness fails:
 
   $ hg branch silliness
   marked working directory as branch silliness
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b >> b
   $ hg ci --close-branch -m'open and close'
   abort: branch "silliness" has no heads to close
@@ -899,57 +890,66 @@
 ---------------------------------------------------------------------
 
   $ hg phase '.^::.'
-  29: draft
-  30: draft
   $ hg commit --amend --secret -m 'amend as secret' -q
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg phase '.^::.'
-  29: draft
-  31: secret
 
 Test that amend with --edit invokes editor forcibly
 ---------------------------------------------------
 
   $ hg parents --template "{desc}
"
-  amend as secret
+  base
   $ HGEDITOR=cat hg commit --amend -m "editor should be suppressed"
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg parents --template "{desc}
"
-  editor should be suppressed
+  base
 
   $ hg status --rev '.^1::.'
-  A foo
+  A a
   $ HGEDITOR=cat hg commit --amend -m "editor should be invoked" --edit
-  editor should be invoked
-  
-  
-  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
-  HG: Leave message empty to abort commit.
-  HG: --
-  HG: user: test
-  HG: branch 'silliness'
-  HG: added foo
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg parents --template "{desc}
"
-  editor should be invoked
+  base
 
 Test that amend with --no-edit avoids the editor
 ------------------------------------------------
 
   $ hg commit --amend -m "before anything happens"
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg parents --template "{desc}
"
-  before anything happens
+  base
   $ HGEDITOR=cat hg commit --amend --no-edit -m "editor should be suppressed"
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg parents --template "{desc}
"
-  editor should be suppressed
+  base
 
 (We need a file change here since we won't have a message change)
   $ cp foo foo.orig
   $ echo hi >> foo
   $ HGEDITOR=cat hg commit --amend --no-edit
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
   $ hg parents --template "{desc}
"
-  editor should be suppressed
+  base
   $ hg status -mar
+  A foo
 (Let's undo adding that "hi" so later tests don't need to be adjusted)
   $ mv foo.orig foo
   $ hg commit --amend --no-edit
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 Test that "diff()" in committemplate works correctly for amending
 -----------------------------------------------------------------
@@ -965,123 +965,45 @@
 
   $ hg parents --template "M: {file_mods}
A: {file_adds}
R: {file_dels}
"
   M: 
-  A: foo
+  A: a
   R: 
   $ hg status -amr
+  A foo
   $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo"
-  expecting diff of foo
-  
-  HG: M: 
-  HG: A: foo
-  HG: R: 
-  HG: diff -r 0eeafd043f63 foo
-  HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -0,0 +1,1 @@
-  HG: +foo
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ echo y > y
   $ hg add y
   $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y"
-  expecting diff of foo and y
-  
-  HG: M: 
-  HG: A: foo y
-  HG: R: 
-  HG: diff -r 0eeafd043f63 foo
-  HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -0,0 +1,1 @@
-  HG: +foo
-  HG: diff -r 0eeafd043f63 y
-  HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ b/y	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -0,0 +1,1 @@
-  HG: +y
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ hg rm a
   $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y"
-  expecting diff of a, foo and y
-  
-  HG: M: 
-  HG: A: foo y
-  HG: R: a
-  HG: diff -r 0eeafd043f63 a
-  HG: --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -1,2 +0,0 @@
-  HG: -a
-  HG: -a
-  HG: diff -r 0eeafd043f63 foo
-  HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -0,0 +1,1 @@
-  HG: +foo
-  HG: diff -r 0eeafd043f63 y
-  HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ b/y	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -0,0 +1,1 @@
-  HG: +y
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ hg rm x
+  not removing x: file is untracked
+  [1]
   $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y"
-  expecting diff of a, foo, x and y
-  
-  HG: M: 
-  HG: A: foo y
-  HG: R: a x
-  HG: diff -r 0eeafd043f63 a
-  HG: --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -1,2 +0,0 @@
-  HG: -a
-  HG: -a
-  HG: diff -r 0eeafd043f63 foo
-  HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -0,0 +1,1 @@
-  HG: +foo
-  HG: diff -r 0eeafd043f63 x
-  HG: --- a/x	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -1,1 +0,0 @@
-  HG: -x
-  HG: diff -r 0eeafd043f63 y
-  HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ b/y	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -0,0 +1,1 @@
-  HG: +y
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
 
   $ echo cccc >> cc
   $ hg status -amr
-  M cc
+  A foo
+  A y
+  R a
   $ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc
-  cc should be excluded
-  
-  HG: M: 
-  HG: A: foo y
-  HG: R: a x
-  HG: diff -r 0eeafd043f63 a
-  HG: --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -1,2 +0,0 @@
-  HG: -a
-  HG: -a
-  HG: diff -r 0eeafd043f63 foo
-  HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -0,0 +1,1 @@
-  HG: +foo
-  HG: diff -r 0eeafd043f63 x
-  HG: --- a/x	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -1,1 +0,0 @@
-  HG: -x
-  HG: diff -r 0eeafd043f63 y
-  HG: --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  HG: +++ b/y	Thu Jan 01 00:00:00 1970 +0000
-  HG: @@ -0,0 +1,1 @@
-  HG: +y
+  abort: abandoned transaction found!
+  (run 'hg recover' to clean up transaction)
+  [255]
 
 Check for issue4405
 -------------------

test-obsolete.t

--- c:/hgdev/src/tests/test-obsolete.t
+++ c:/hgdev/src/tests/test-obsolete.t.err
@@ -1196,6 +1196,9 @@
   $ killdaemons.py
 
   $ rm hg.pid access.log errors.log
+  rm: cannot remove `access.log': Permission denied
+  rm: cannot remove `errors.log': Permission denied
+  [1]
 
 #endif
 

test-push-race.t#unrelated

--- c:/hgdev/src/tests/test-push-race.t
+++ c:/hgdev/src/tests/test-push-race.t#unrelated.err
@@ -205,6 +205,7 @@
   remote: added 1 changesets with 1 changes to 1 files
 
   $ release $TESTTMP/watchfile
+  touch: setting times of `C:\Temp\hgtests.fpdfan\child9\test-push-race.t-unrelated/watchfile': Permission denied
 
 Check the result of the push
 

Skipped Tests

• test-archive-symlinks.t
• test-byteify-strings.t
• test-casecollision.t
• test-changelog-exec.t
• test-check-clang-format.t
• test-check-execute.t
• test-check-format.t
• test-check-jshint.t
• test-check-pyflakes.t
• test-check-pylint.t
• test-check-rust-format.t
• test-chg.t
• test-clone-cgi.t
• test-commit-interactive-curses.t
• test-contrib-emacs.t
• test-contrib-relnotes.t
• test-convert-baz.t
• test-convert-bzr-114.t
• test-convert-bzr-directories.t
• test-convert-bzr-ghosts.t
• test-convert-bzr-merges.t
• test-convert-bzr-treeroot.t
• test-convert-bzr.t
• test-convert-cvs-branch.t
• test-convert-cvs-detectmerge.t
• test-convert-cvs-synthetic.t
• test-convert-cvs.t
• test-convert-cvsnt-mergepoints.t
• test-convert-darcs.t
• test-convert-git.t
• test-convert-hg-svn.t
• test-convert-mtn.t
• test-convert-p4-filetypes.t
• test-convert-p4.t
• test-convert-svn-branches.t
• test-convert-svn-encoding.t
• test-convert-svn-move.t
• test-convert-svn-sink.t
• test-convert-svn-source.t
• test-convert-svn-startrev.t
• test-convert-svn-tags.t
• test-convert-tagsbranch-topology.t
• test-convert-tla.t
• test-debian-packages.t
• test-diff-upgrade.t
• test-docker-packaging.t
• test-eolfilename.t
• test-execute-bit.t
• test-filecache.py
• test-fix-clang-format.t
• test-flags.t
• test-fuzz-targets.t
• test-gendoc-da.t
• test-gendoc-de.t
• test-gendoc-el.t
• test-gendoc-fr.t
• test-gendoc-it.t
• test-gendoc-ja.t
• test-gendoc-pt_BR.t
• test-gendoc-ro.t
• test-gendoc-ru.t
• test-gendoc-sv.t
• test-gendoc-zh_CN.t
• test-gendoc-zh_TW.t
• test-gendoc.t
• test-gpg.t
• test-hgwebdirsym.t
• test-highlight.t
• test-inherit-mode.t
• test-issue1438.t
• test-issue1802.t
• test-lfs-test-server.t#git-server
• test-lock-badness.t
• test-logtoprocess.t
• test-mac-packages.t
• test-merge-types.t
• test-mq-subrepo-svn.t
• test-mq-symlinks.t
• test-newcgi.t
• test-newercgi.t
• test-nointerrupt.t
• test-oldcgi.t
• test-permissions.t
• test-phabricator.t
• test-pull-permission.t
• test-push-cgi.t
• test-rebase-inmemory.t
• test-releasenotes-formatting.t
• test-releasenotes-merging.t
• test-releasenotes-parsing.t
• test-remotefilelog-bad-configs.t
• test-remotefilelog-bgprefetch.t
• test-remotefilelog-blame.t
• test-remotefilelog-bundle2-legacy.t
• test-remotefilelog-bundle2.t
• test-remotefilelog-bundles.t
• test-remotefilelog-cacheprocess.t
• test-remotefilelog-clone-tree.t
• test-remotefilelog-clone.t
• test-remotefilelog-corrupt-cache.t
• test-remotefilelog-datapack.py
• test-remotefilelog-gc.t
• test-remotefilelog-gcrepack.t
• test-remotefilelog-histpack.py
• test-remotefilelog-http.t
• test-remotefilelog-keepset.t
• test-remotefilelog-linknodes.t
• test-remotefilelog-local.t
• test-remotefilelog-log.t
• test-remotefilelog-partial-shallow.t
• test-remotefilelog-permissions.t
• test-remotefilelog-prefetch.t
• test-remotefilelog-pull-noshallow.t
• test-remotefilelog-push-pull.t
• test-remotefilelog-repack-fast.t
• test-remotefilelog-repack.t
• test-remotefilelog-share.t
• test-remotefilelog-sparse.t
• test-remotefilelog-tags.t
• test-remotefilelog-wireproto.t
• test-repair-strip.t
• test-revert-flags.t
• test-sparse-fsmonitor.t
• test-sparse-revlog.t
• test-sqlitestore.t
• test-ssh-repoerror.t
• test-subrepo-git.t
• test-subrepo-svn.t
• test-symlink-os-yes-fs-no.py
• test-symlink-placeholder.t
• test-symlinks.t
• test-update-atomic.t
• test-update-issue1456.t
• test-verify-repo-operations.py
• test-wireproto-exchangev2-shallow.t

Long Tests

Timeline