annotate tests/test-hook.out @ 1822:64df4220b349

copy/rename to a removed destination file When the destination of a copy or rename operation has been marked for removal, we need to restore it before we overwrite it with the new content. This also handles the case of idempotent renames, i.e. hg rename "a" "b" hg rename "b" "a"
author Robin Farine <robin.farine@terminus.org>
date Tue, 28 Feb 2006 23:47:40 -0800
parents 50de0887bbcd
children 429bf036f2cb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1735
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
1 precommit hook: p1=0000000000000000000000000000000000000000 p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
2 pretxncommit hook: n=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p1=0000000000000000000000000000000000000000 p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
3 0:cb9a9f314b8b
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
4 commit hook b
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
5 commit hook: n=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p1=0000000000000000000000000000000000000000 p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
6 precommit hook: p1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
7 pretxncommit hook: n=ab228980c14deea8b9555d91c9581127383e40fd p1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
8 1:ab228980c14d
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
9 commit hook b
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
10 commit hook: n=ab228980c14deea8b9555d91c9581127383e40fd p1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
11 precommit hook: p1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
12 pretxncommit hook: n=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 p1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
13 2:ee9deb46ab31
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
14 commit hook b
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
15 commit hook: n=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 p1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
16 precommit hook: p1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 p2=ab228980c14deea8b9555d91c9581127383e40fd
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
17 pretxncommit hook: n=07f3376c1e655977439df2a814e3cc14b27abac2 p1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 p2=ab228980c14deea8b9555d91c9581127383e40fd
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
18 3:07f3376c1e65
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
19 commit hook b
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
20 commit hook: n=07f3376c1e655977439df2a814e3cc14b27abac2 p1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 p2=ab228980c14deea8b9555d91c9581127383e40fd
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
21 prechangegroup hook
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
22 changegroup hook: n=ab228980c14deea8b9555d91c9581127383e40fd
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
23 incoming hook: n=ab228980c14deea8b9555d91c9581127383e40fd
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
24 incoming hook: n=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
25 incoming hook: n=07f3376c1e655977439df2a814e3cc14b27abac2
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
26 pulling from ../a
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
27 searching for changes
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
28 adding changesets
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
29 adding manifests
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
30 adding file changes
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
31 added 3 changesets with 2 changes to 2 files
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
32 (run 'hg update' to get a working copy)
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
33 pretag hook: t=a n=07f3376c1e655977439df2a814e3cc14b27abac2 l=0
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
34 precommit hook: p1=07f3376c1e655977439df2a814e3cc14b27abac2 p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
35 pretxncommit hook: n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 p1=07f3376c1e655977439df2a814e3cc14b27abac2 p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
36 4:3cd2c6a5a36c
1481
acd1832ebf31 Change test-hook to test multiple hooks
Matt Mackall <mpm@selenic.com>
parents: 925
diff changeset
37 commit hook b
1735
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
38 commit hook: n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 p1=07f3376c1e655977439df2a814e3cc14b27abac2 p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
39 tag hook: t=a n=07f3376c1e655977439df2a814e3cc14b27abac2 l=0
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
40 pretag hook: t=la n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 l=1
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
41 tag hook: t=la n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 l=1
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
42 pretag hook: t=fa n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 l=0
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
43 pretag.forbid hook
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
44 abort: pretag.forbid hook exited with status 1
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
45 pretag hook: t=fla n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 l=1
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
46 pretag.forbid hook
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
47 abort: pretag.forbid hook exited with status 1
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
48 4:3cd2c6a5a36c
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
49 precommit hook: p1=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 p2=
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
50 pretxncommit.forbid hook: tip=5:469a61fe67d6
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
51 abort: pretxncommit.forbid hook exited with status 1
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
52 transaction abort!
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
53 rollback completed
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
54 4:3cd2c6a5a36c
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
55 precommit.forbid hook
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
56 abort: precommit.forbid hook exited with status 1
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
57 4:3cd2c6a5a36c
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
58 3:07f3376c1e65
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
59 prechangegroup.forbid hook
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
60 pulling from ../a
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
61 searching for changes
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
62 abort: prechangegroup.forbid hook exited with status 1
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
63 pretxnchangegroup.forbid hook: tip=4:3cd2c6a5a36c
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
64 pulling from ../a
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
65 searching for changes
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
66 adding changesets
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
67 adding manifests
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
68 adding file changes
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
69 added 1 changesets with 1 changes to 1 files
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
70 abort: pretxnchangegroup.forbid hook exited with status 1
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
71 transaction abort!
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
72 rollback completed
791405fe9991 i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1481
diff changeset
73 3:07f3376c1e65
1736
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
74 preoutgoing hook: s=pull
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
75 outgoing hook: n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 s=pull
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
76 pulling from ../a
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
77 searching for changes
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
78 adding changesets
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
79 adding manifests
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
80 adding file changes
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
81 added 1 changesets with 1 changes to 1 files
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
82 (run 'hg update' to get a working copy)
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
83 rolling back last transaction
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
84 preoutgoing hook: s=pull
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
85 preoutgoing.forbid hook
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
86 pulling from ../a
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
87 searching for changes
50de0887bbcd add preoutgoing and outgoing hooks.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1735
diff changeset
88 abort: preoutgoing.forbid hook exited with status 1