annotate tests/test-hgcia.t @ 12664:545ec1775021

merge: handle no file parent in backwards merge (issue2364)
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Oct 2010 14:50:20 -0500
parents 01c6be8361df
children c322890b03e6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
1 Test the CIA extension
7438
b80b944836ec Add hgcia to hgext
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
2
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
3 $ cat >> $HGRCPATH <<EOF
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
4 > [extensions]
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
5 > hgcia=
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
6 >
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
7 > [hooks]
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
8 > changegroup.cia = python:hgext.hgcia.hook
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
9 >
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
10 > [cia]
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
11 > user = testuser
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
12 > project = testproject
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
13 > test = True
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
14 > EOF
7438
b80b944836ec Add hgcia to hgext
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
15
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
16 $ hg init src
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
17 $ hg init cia
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
18 $ cd src
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
19 $ echo foo > foo
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
20 $ hg ci -Amfoo
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
21 adding foo
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
22 $ hg push ../cia
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
23 pushing to ../cia
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
24 searching for changes
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
25 adding changesets
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
26 adding manifests
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
27 adding file changes
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
28 added 1 changesets with 1 changes to 1 files
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
29
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
30 <message>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
31 <generator>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
32 <name>Mercurial (hgcia)</name>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
33 <version>0.1</version>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
34 <url>http://hg.kublai.com/mercurial/hgcia</url>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
35 <user>testuser</user>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
36 </generator>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
37 <source>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
38 <project>testproject</project>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
39 <branch>default</branch>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
40 </source>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
41 <body>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
42 <commit>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
43 <author>test</author>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
44 <version>0:e63c23eaa88a</version>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
45 <log>foo</log>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
46
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
47 <files><file action="add">foo</file></files>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
48 </commit>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
49 </body>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
50 <timestamp>0</timestamp>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
51 </message>