1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
Load commonly used test logic
$ . "$TESTDIR/testutil"
$ git init gitrepo
Initialized empty Git repository in $TESTTMP/gitrepo/.git/
$ cd gitrepo
$ git config receive.denyCurrentBranch ignore
$ echo alpha > alpha
$ git add alpha
$ fn_git_commit -m "add alpha"
cloning without hggit.usephases does not publish local changesets
$ cd ..
$ hg clone gitrepo hgrepo | grep -v '^updating'
importing 1 git commits
new changesets ff7a2f2d8d70 (1 drafts)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd hgrepo
$ hg phase -r master
0: draft
$ cd ..
pulling without hggit.usephases does not publish local changesets
$ cd gitrepo
$ git checkout -q master
$ echo beta > beta
$ git add beta
$ fn_git_commit -m 'add beta'
$ cd ..
$ cd hgrepo
$ hg pull
pulling from $TESTTMP/gitrepo
importing 1 git commits
updating bookmark master
new changesets 7fe02317c63d (1 drafts)
(run 'hg update' to get a working copy)
$ hg phase -r master
1: draft
pulling with git.public does not publish local changesets
$ hg --config git.public=master pull
pulling from $TESTTMP/gitrepo
no changes found
$ hg phase -r master
1: draft
pushing without hggit.usephases does not publish local changesets
$ hg update master
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo gamma > gamma
$ hg add gamma
$ hg commit -m 'gamma'
$ hg push
pushing to $TESTTMP/gitrepo
searching for changes
adding objects
remote: found 0 deltas to reuse
added 1 commits with 1 trees and 1 blobs
updating reference refs/heads/master
$ hg phase -r master
2: draft
|
