Mercurial > hg > pyhgsh

view tests/test-up-local-change.out @ 2328:f789602ba840

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb.manifest: revno of manifest and changelog aren't always the same In the v4l-dvb repo, the manifest revno and the changelog revno are not in sync. This happened because the same patch was applied to the same revision in two different branches, resulting in the same manifest text, with the same parents and so the first revision was reused. Since hgweb.manifest was assuming the revnos of the manifest and of the changelog were always the same, clicking on manifest -> bz2 in the v4l-dvb site would download the wrong revision. Use the linkrev to go from manifest revision to changelog revision. This still won't be perfect since the page will still talk about "manifest for changeset XYZ", where XYZ was the first changeset to have this manifest, which is not necessarily the same changeset that the user clicked to get to this page - but at least the contents will be the same.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 20 May 2006 15:34:19 -0300
parents e506c14382fd
children
line wrap: on
line source

(the addremove command is deprecated; use add and remove --after instead)
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r 33aaa84a386b a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@ a
-a
+abc
(the addremove command is deprecated; use add and remove --after instead)
adding b
M a
changeset:   0:33aaa84a386b
user:        test
date:        Mon Jan 12 13:46:40 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
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
changeset:   1:802f095af299
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

resolving manifests
 force None allow None moddirstate True linear True
 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c
remote deleted b
removing b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
changeset:   0:33aaa84a386b
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

abort: there is nothing to merge, just use 'hg update'
failed
changeset:   0:33aaa84a386b
user:        test
date:        Mon Jan 12 13:46:40 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
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
changeset:   1:802f095af299
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   1:802f095af299cde27a85b2f056aef3829870956c
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
files:       a b
description:
2


changeset:   0:33aaa84a386bd609094aeb21a97c09436c482ef1
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
files:       a
description:
1


diff -r 802f095af299 a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@ a2
-a2
+abc
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(the addremove command is deprecated; use add and remove --after instead)
adding b
M a
changeset:   1:802f095af299
user:        test
date:        Mon Jan 12 13:46:40 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 'hg merge' to merge across branches or 'hg update -C' to lose changes)
failed
abort: outstanding uncommitted changes
failed
resolving manifests
 force False allow True 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
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
changeset:   1:802f095af299
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   2:030602aee63d
tag:         tip
parent:      0:33aaa84a386b
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

diff -r 802f095af299 a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@ a2
-a2
+abc
adding a
pulling from ../a
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved