##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Merge with upstream
Merge with upstream
Benoit Boissinot - - Load All Authors

File last commit:

r1674:dee55c4a default
r1743:813f9f5f merge default
Show More
test-up-local-change.out
133 lines | 3.0 KiB | text/plain | TextLexer
/ tests / test-up-local-change.out
History | Source | Raw |Copy content |Copy permalink
Bryan O'Sullivan
Update tests to match new addremove chattiness.
 r767 adding a
Thomas Arendsen Hein
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli....
 r396 diff -r c19d34741b0a a
mpm@selenic.com
Add a simple testing framework...
 r331 --- a/a
+++ b/a
mason@suse.com
Add new bdiff based unidiff generation.
 r1637 @@ -1,1 +1,1 @@ a
mpm@selenic.com
Add a simple testing framework...
 r331 -a
+abc
Bryan O'Sullivan
Update tests to match new addremove chattiness.
 r767 adding b
mpm@selenic.com
Update test output for status change...
 r748 M a
Benoit Boissinot
abort when using 'update -m' and this is not a merge...
 r1674 changeset: 0:c19d34741b0a
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 1
mpm@selenic.com
Add a simple testing framework...
 r331 resolving manifests
Matt Mackall
Fix up test for update flags
 r677 force None allow None moddirstate True linear True
mpm@selenic.com
update tests to reflect new short hash length...
 r374 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
mpm@selenic.com
Add a simple testing framework...
 r331 a versions differ, resolve
remote created b
getting b
merging a
resolving a
Matt Mackall
Repair ancestor logic, fix up test cases
 r1351 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
Benoit Boissinot
abort when using 'update -m' and this is not a merge...
 r1674 changeset: 1:1e71731e6fbb
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 2
mpm@selenic.com
Add a simple testing framework...
 r331 resolving manifests
Benoit Boissinot
abort when using 'update -m' and this is not a merge...
 r1674 force None allow None moddirstate True linear True
ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c
remote deleted b
removing b
changeset: 0:c19d34741b0a
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 1
abort: there is nothing to merge, just use 'hg update'
failed
changeset: 0:c19d34741b0a
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 1
resolving manifests
force None allow None moddirstate True linear True
ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
a versions differ, resolve
remote created b
getting b
merging a
resolving a
file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
mpm@selenic.com
Fix tests for short changeset hashes and hidden manifest hashes
 r784 changeset: 1:1e71731e6fbb
Thomas Arendsen Hein
Fixed tests for displaying tags in hg history and hg parents....
 r388 tag: tip
mpm@selenic.com
Add a simple testing framework...
 r331 user: test
Samuel Tardieu
[PATCH] Print timezone offset when outputting dates...
 r967 date: Thu Jan 1 00:00:00 1970 +0000
mpm@selenic.com
Add a simple testing framework...
 r331 summary: 2
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
Thomas Arendsen Hein
Fixed tests for displaying tags in hg history and hg parents....
 r388 tag: tip
mpm@selenic.com
Add a simple testing framework...
 r331 user: test
Samuel Tardieu
[PATCH] Print timezone offset when outputting dates...
 r967 date: Thu Jan 1 00:00:00 1970 +0000
Thomas Arendsen Hein
Fixed test for previous change of 'hg -v history'....
 r494 files: a b
mpm@selenic.com
Add a simple testing framework...
 r331 description:
2
Thomas Arendsen Hein
Add an empty line after description in verbose mode of show_changeset....
 r546
mpm@selenic.com
Add a simple testing framework...
 r331 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
user: test
Samuel Tardieu
[PATCH] Print timezone offset when outputting dates...
 r967 date: Thu Jan 1 00:00:00 1970 +0000
Thomas Arendsen Hein
Fixed test for previous change of 'hg -v history'....
 r494 files: a
mpm@selenic.com
Add a simple testing framework...
 r331 description:
1
Thomas Arendsen Hein
Add an empty line after description in verbose mode of show_changeset....
 r546
mpm@selenic.com
Fix local file changes being ignored after non-branch merge...
 r768 diff -r 1e71731e6fbb a
--- a/a
+++ b/a
mason@suse.com
Add new bdiff based unidiff generation.
 r1637 @@ -1,1 +1,1 @@ a2
mpm@selenic.com
Fix local file changes being ignored after non-branch merge...
 r768 -a2
+abc
Benoit Boissinot
abort when using 'update -m' and this is not a merge...
 r1674 adding b
M a
changeset: 1:1e71731e6fbb
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 2
resolving manifests
force None allow None moddirstate True linear False
ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
a versions differ, resolve
b versions differ, resolve
this update spans a branch affecting the following files:
a (resolve)
b (resolve)
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)
failed
abort: outstanding uncommited changes
failed
resolving manifests
force None allow 1 moddirstate True linear False
ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
a versions differ, resolve
b versions differ, resolve
merging a
resolving a
file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2
merging b
resolving b
file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000
changeset: 1:1e71731e6fbb
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 2
changeset: 2:83c51d0caff4
tag: tip
parent: 0:c19d34741b0a
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 3
diff -r 1e71731e6fbb a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@ a2
-a2
+abc