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

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

[PATCH] Removal of a file added by merging branches...
[PATCH] Removal of a file added by merging branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----
mpm@selenic.com - - Load All Authors

File last commit:

r414:291a6284 default
r416:5e9e8b8d default
Show More
test-flags.out
51 lines | 1.4 KiB | text/plain | TextLexer
/ tests / test-flags.out
History | Annotation | Raw |Copy content |Copy permalink
pulling from ../test1
requesting all changes
adding changesets
adding manifests
adding file revisions
modified 2 files, added 1 changesets and 2 new revisions
(run 'hg update' to get a working copy)
pulling from ../test2
searching for changes
adding changesets
adding manifests
adding file revisions
modified 1 files, added 1 changesets and 1 new revisions
(run 'hg update' to get a working copy)
changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1
tag: tip
parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7
user: test
date: Thu Jan 1 00:00:00 1970
summary: chmod +x a
changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
user: test
date: Thu Jan 1 00:00:00 1970
summary: a updated
changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1
tag: tip
parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7
user: test
date: Thu Jan 1 00:00:00 1970
summary: chmod +x a
changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
user: test
date: Thu Jan 1 00:00:00 1970
summary: a updated
changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7
user: test
date: Thu Jan 1 00:00:00 1970
summary: added a b
resolving manifests
ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e
a versions differ, resolve
merging a
resolving a
file a: other 37c42bd6cc03 ancestor b80de5d13875
-rwxr-xr-x
-rwxr-xr-x