author | Patrick Mezard <pmezard@gmail.com> |
Thu, 19 May 2011 22:49:43 +0200 | |
changeset 14391 | 1e64e1e12195 |
parent 13569 | 3ab3b892d223 |
child 14481 | b2ee161328e0 |
permissions | -rw-r--r-- |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
1 |
$ "$TESTDIR/hghave" git || exit 80 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
2 |
|
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
3 |
make git commits repeatable |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
4 |
|
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
5 |
$ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
6 |
$ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
7 |
$ GIT_AUTHOR_DATE='1234567891 +0000'; export GIT_AUTHOR_DATE |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
8 |
$ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
9 |
$ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
10 |
$ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
11 |
|
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
12 |
root hg repo |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
13 |
|
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
14 |
$ hg init t |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
15 |
$ cd t |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
16 |
$ echo a > a |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
17 |
$ hg add a |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
18 |
$ hg commit -m a |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
19 |
$ cd .. |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
20 |
|
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
21 |
new external git repo |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
22 |
|
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
23 |
$ mkdir gitroot |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
24 |
$ cd gitroot |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
25 |
$ git init -q |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
26 |
$ echo g > g |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
27 |
$ git add g |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
28 |
$ git commit -q -m g |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
29 |
|
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
30 |
add subrepo clone |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
31 |
|
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
32 |
$ cd ../t |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
33 |
$ echo 's = [git]../gitroot' > .hgsub |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
34 |
$ git clone -q ../gitroot s |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
35 |
$ hg add .hgsub |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
36 |
$ hg commit -m 'new git subrepo' |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
37 |
committing subrepository s |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
38 |
$ hg debugsub |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
39 |
path s |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
40 |
source ../gitroot |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
41 |
revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
42 |
|
12995
d90fc91c8377
subrepo: update and merge works with any git branch
Eric Eisner <ede@mit.edu>
parents:
12994
diff
changeset
|
43 |
record a new commit from upstream from a different branch |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
44 |
|
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
45 |
$ cd ../gitroot |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
46 |
$ git checkout -q -b testing |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
47 |
$ echo gg >> g |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
48 |
$ git commit -q -a -m gg |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
49 |
|
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
50 |
$ cd ../t/s |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
51 |
$ git pull -q >/dev/null 2>/dev/null |
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
52 |
$ git checkout -q -b testing origin/testing >/dev/null |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
53 |
|
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
54 |
$ cd .. |
13182
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
55 |
$ hg status --subrepos |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
56 |
M s/g |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
57 |
$ hg commit -m 'update git subrepo' |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
58 |
committing subrepository s |
12992
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
59 |
$ hg debugsub |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
60 |
path s |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
61 |
source ../gitroot |
2b73a3279a9f
subrepo: support for adding a git subrepo
Eric Eisner <ede@mit.edu>
parents:
diff
changeset
|
62 |
revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a |
12993
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
63 |
|
13092
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
64 |
make $GITROOT pushable, by replacing it with a clone with nothing checked out |
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
65 |
|
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
66 |
$ cd .. |
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
67 |
$ git clone gitroot gitrootbare --bare -q |
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
68 |
$ rm -rf gitroot |
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
69 |
$ mv gitrootbare gitroot |
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
70 |
|
12993
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
71 |
clone root |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
72 |
|
13092
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
73 |
$ cd t |
12993
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
74 |
$ hg clone . ../tc |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
75 |
updating to branch default |
13525
c12088259f64
subrepo: show the source that git clones
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
76 |
cloning subrepo s from $TESTTMP/gitroot |
12993
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
77 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
78 |
$ cd ../tc |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
79 |
$ hg debugsub |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
80 |
path s |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
81 |
source ../gitroot |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
82 |
revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
83 |
|
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
84 |
update to previous substate |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
85 |
|
13111
560b8001f765
subrepo: silence git output when ui.quiet is set
Eric Eisner <ede@mit.edu>
parents:
13092
diff
changeset
|
86 |
$ hg update 1 -q |
12993
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
87 |
$ cat s/g |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
88 |
g |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
89 |
$ hg debugsub |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
90 |
path s |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
91 |
source ../gitroot |
a91334380699
subrepo: cloning and updating of git subrepos
Eric Eisner <ede@mit.edu>
parents:
12992
diff
changeset
|
92 |
revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
93 |
|
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
94 |
clone root, make local change |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
95 |
|
13092
83986af605e5
test-subrepo-git.t: make gitroot pushable earlier
Eric Eisner <ede@mit.edu>
parents:
13091
diff
changeset
|
96 |
$ cd ../t |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
97 |
$ hg clone . ../ta |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
98 |
updating to branch default |
13525
c12088259f64
subrepo: show the source that git clones
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
99 |
cloning subrepo s from $TESTTMP/gitroot |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
100 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
101 |
|
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
102 |
$ cd ../ta |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
103 |
$ echo ggg >> s/g |
13182
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
104 |
$ hg status --subrepos |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
105 |
M s/g |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
106 |
$ hg commit -m ggg |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
107 |
committing subrepository s |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
108 |
$ hg debugsub |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
109 |
path s |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
110 |
source ../gitroot |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
111 |
revision 79695940086840c99328513acbe35f90fcd55e57 |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
112 |
|
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
113 |
clone root separately, make different local change |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
114 |
|
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
115 |
$ cd ../t |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
116 |
$ hg clone . ../tb |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
117 |
updating to branch default |
13525
c12088259f64
subrepo: show the source that git clones
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
118 |
cloning subrepo s from $TESTTMP/gitroot |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
119 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
120 |
|
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
121 |
$ cd ../tb/s |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
122 |
$ echo f > f |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
123 |
$ git add f |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
124 |
$ cd .. |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
125 |
|
13182
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
126 |
$ hg status --subrepos |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
127 |
A s/f |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
128 |
$ hg commit -m f |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
129 |
committing subrepository s |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
130 |
$ hg debugsub |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
131 |
path s |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
132 |
source ../gitroot |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
133 |
revision aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
134 |
|
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
135 |
user b push changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
136 |
|
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
137 |
$ hg push 2>/dev/null |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
138 |
pushing to $TESTTMP/t |
13029 | 139 |
pushing branch testing of subrepo s |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
140 |
searching for changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
141 |
adding changesets |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
142 |
adding manifests |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
143 |
adding file changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
144 |
added 1 changesets with 1 changes to 1 files |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
145 |
|
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
146 |
user a pulls, merges, commits |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
147 |
|
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
148 |
$ cd ../ta |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
149 |
$ hg pull |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
150 |
pulling from $TESTTMP/t |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
151 |
searching for changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
152 |
adding changesets |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
153 |
adding manifests |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
154 |
adding file changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
155 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
156 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
157 |
$ hg merge 2>/dev/null |
13569
3ab3b892d223
subrepo: show the source that git pulls
Eric Eisner <ede@mit.edu>
parents:
13560
diff
changeset
|
158 |
pulling subrepo s from $TESTTMP/gitroot |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
159 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
160 |
(branch merge, don't forget to commit) |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
161 |
$ cat s/f |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
162 |
f |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
163 |
$ cat s/g |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
164 |
g |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
165 |
gg |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
166 |
ggg |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
167 |
$ hg commit -m 'merge' |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
168 |
committing subrepository s |
13182
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
169 |
$ hg status --subrepos --rev 1:5 |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
170 |
M .hgsubstate |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
171 |
M s/g |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
172 |
A s/f |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
173 |
$ hg debugsub |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
174 |
path s |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
175 |
source ../gitroot |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
176 |
revision f47b465e1bce645dbf37232a00574aa1546ca8d3 |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
177 |
$ hg push 2>/dev/null |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
178 |
pushing to $TESTTMP/t |
13029 | 179 |
pushing branch testing of subrepo s |
12994
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
180 |
searching for changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
181 |
adding changesets |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
182 |
adding manifests |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
183 |
adding file changes |
845c602b8635
subrepo: allow git subrepos to push and merge
Eric Eisner <ede@mit.edu>
parents:
12993
diff
changeset
|
184 |
added 2 changesets with 2 changes to 1 files |
12996
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
185 |
|
13029 | 186 |
make upstream git changes |
187 |
||
188 |
$ cd .. |
|
189 |
$ git clone -q gitroot gitclone |
|
190 |
$ cd gitclone |
|
191 |
$ echo ff >> f |
|
192 |
$ git commit -q -a -m ff |
|
193 |
$ echo fff >> f |
|
194 |
$ git commit -q -a -m fff |
|
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
195 |
$ git push origin testing 2>/dev/null |
13029 | 196 |
|
197 |
make and push changes to hg without updating the subrepo |
|
198 |
||
199 |
$ cd ../t |
|
200 |
$ hg clone . ../td |
|
201 |
updating to branch default |
|
13525
c12088259f64
subrepo: show the source that git clones
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
202 |
cloning subrepo s from $TESTTMP/gitroot |
13029 | 203 |
checking out detached HEAD in subrepo s |
204 |
check out a git branch if you intend to make changes |
|
205 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
206 |
$ cd ../td |
|
207 |
$ echo aa >> a |
|
208 |
$ hg commit -m aa |
|
209 |
$ hg push |
|
210 |
pushing to $TESTTMP/t |
|
211 |
searching for changes |
|
212 |
adding changesets |
|
213 |
adding manifests |
|
214 |
adding file changes |
|
215 |
added 1 changesets with 1 changes to 1 files |
|
216 |
||
13087
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
217 |
sync to upstream git, distribute changes |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
218 |
|
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
219 |
$ cd ../ta |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
220 |
$ hg pull -u -q |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
221 |
$ cd s |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
222 |
$ git pull -q >/dev/null 2>/dev/null |
13087
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
223 |
$ cd .. |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
224 |
$ hg commit -m 'git upstream sync' |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
225 |
committing subrepository s |
13087
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
226 |
$ hg debugsub |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
227 |
path s |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
228 |
source ../gitroot |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
229 |
revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
230 |
$ hg push -q |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
231 |
|
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
232 |
$ cd ../tb |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
233 |
$ hg pull -q |
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
234 |
$ hg update 2>/dev/null |
13569
3ab3b892d223
subrepo: show the source that git pulls
Eric Eisner <ede@mit.edu>
parents:
13560
diff
changeset
|
235 |
pulling subrepo s from $TESTTMP/gitroot |
13087
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
236 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
237 |
$ hg debugsub |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
238 |
path s |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
239 |
source ../gitroot |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
240 |
revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
cca0779b4832
subrepo: lazily update git's local tracking branches
Eric Eisner <ede@mit.edu>
parents:
13029
diff
changeset
|
241 |
|
12996
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
242 |
update to a revision without the subrepo, keeping the local git repository |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
243 |
|
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
244 |
$ cd ../t |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
245 |
$ hg up 0 |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
246 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
13010
6bdae8ea0b48
test-subrepo-git.t: portability fix.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12996
diff
changeset
|
247 |
$ ls -a s |
12996
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
248 |
. |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
249 |
.. |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
250 |
.git |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
251 |
|
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
252 |
$ hg up 2 |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
253 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
13010
6bdae8ea0b48
test-subrepo-git.t: portability fix.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12996
diff
changeset
|
254 |
$ ls -a s |
12996
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
255 |
. |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
256 |
.. |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
257 |
.git |
3a42651b0a62
subrepo: removing (and restoring) git subrepo state
Eric Eisner <ede@mit.edu>
parents:
12995
diff
changeset
|
258 |
g |
13027 | 259 |
|
260 |
archive subrepos |
|
261 |
||
13091
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
262 |
$ cd ../tc |
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
263 |
$ hg pull -q |
8cecea387574
test-subrepo-git.t: silence git output
Eric Eisner <ede@mit.edu>
parents:
13087
diff
changeset
|
264 |
$ hg archive --subrepos -r 5 ../archive 2>/dev/null |
13569
3ab3b892d223
subrepo: show the source that git pulls
Eric Eisner <ede@mit.edu>
parents:
13560
diff
changeset
|
265 |
pulling subrepo s from $TESTTMP/gitroot |
13027 | 266 |
$ cd ../archive |
267 |
$ cat s/f |
|
268 |
f |
|
269 |
$ cat s/g |
|
270 |
g |
|
271 |
gg |
|
272 |
ggg |
|
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
273 |
|
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
274 |
create nested repo |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
275 |
|
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
276 |
$ cd .. |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
277 |
$ hg init outer |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
278 |
$ cd outer |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
279 |
$ echo b>b |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
280 |
$ hg add b |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
281 |
$ hg commit -m b |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
282 |
|
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
283 |
$ hg clone ../t inner |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
284 |
updating to branch default |
13525
c12088259f64
subrepo: show the source that git clones
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
285 |
cloning subrepo s from $TESTTMP/gitroot |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
286 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
287 |
$ echo inner = inner > .hgsub |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
288 |
$ hg add .hgsub |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
289 |
$ hg commit -m 'nested sub' |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
290 |
committing subrepository inner |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
291 |
|
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
292 |
nested commit |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
293 |
|
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
294 |
$ echo ffff >> inner/s/f |
13182
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
295 |
$ hg status --subrepos |
2537bd17421d
subrepo: basic support for status of git subrepos
Eric Eisner <ede@mit.edu>
parents:
13181
diff
changeset
|
296 |
M inner/s/f |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
297 |
$ hg commit -m nested |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
298 |
committing subrepository inner |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
299 |
committing subrepository inner/s |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
300 |
|
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
301 |
nested archive |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
302 |
|
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
303 |
$ hg archive --subrepos ../narchive |
13296
5dda6c708138
Ignore pax_global_header that some tar versions write as a file.
Lee Cantey <lcantey@embarcadero.com>
parents:
13182
diff
changeset
|
304 |
$ ls ../narchive/inner/s | grep -v pax_global_header |
13181
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
305 |
f |
413bef846806
subrepo: fix subrelpath for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13111
diff
changeset
|
306 |
g |
13324
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
307 |
|
13460
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
308 |
relative source expansion |
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
309 |
|
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
310 |
$ cd .. |
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
311 |
$ mkdir d |
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
312 |
$ hg clone t d/t |
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
313 |
updating to branch default |
13525
c12088259f64
subrepo: show the source that git clones
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
314 |
cloning subrepo s from $TESTTMP/gitroot |
13460
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
315 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
64bb8e586a92
subrepo: expand relative sources for git subrepos
Eric Eisner <ede@mit.edu>
parents:
13428
diff
changeset
|
316 |
|
13553
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
317 |
Don't crash if the subrepo is missing |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
318 |
|
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
319 |
$ hg clone t missing -q |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
320 |
$ cd missing |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
321 |
$ rm -rf s |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
322 |
$ hg status -S |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
323 |
$ hg sum | grep commit |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
324 |
commit: 1 subrepos |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
325 |
$ hg push -q |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
326 |
abort: subrepo s is missing |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
327 |
[255] |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
328 |
$ hg commit -qm missing |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
329 |
abort: subrepo s is missing |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
330 |
[255] |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
331 |
$ hg update -C |
13560 | 332 |
cloning subrepo s from $TESTTMP/gitroot |
13553
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
333 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
334 |
$ hg sum | grep commit |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
335 |
commit: (clean) |
dea6efdd7ec4
subrepo: don't crash when git repo is missing
Eric Eisner <ede@mit.edu>
parents:
13460
diff
changeset
|
336 |
|
13324
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
337 |
Check hg update --clean |
13331
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
338 |
$ cd $TESTTMP/ta |
13324
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
339 |
$ echo > s/g |
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
340 |
$ cd s |
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
341 |
$ echo c1 > f1 |
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
342 |
$ echo c1 > f2 |
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
343 |
$ git add f1 |
e5617047c926
subrepo: make update -C clean the working directory for git subrepos
Erik Zielke <ez@aragost.com>
parents:
13296
diff
changeset
|
344 |
$ cd .. |
13331
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
345 |
$ hg status -S |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
346 |
M s/g |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
347 |
A s/f1 |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
348 |
$ ls s |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
349 |
f |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
350 |
f1 |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
351 |
f2 |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
352 |
g |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
353 |
$ hg update --clean |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
354 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
355 |
$ hg status -S |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
356 |
$ ls s |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
357 |
f |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
358 |
f1 |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
359 |
f2 |
9f2c6892e004
test-subrepo-git.t: make compatible with old git
Eric Eisner <ede@mit.edu>
parents:
13324
diff
changeset
|
360 |
g |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
361 |
|
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
362 |
Sticky subrepositories, no changes |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
363 |
$ cd $TESTTMP/ta |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
364 |
$ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
365 |
7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
366 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
367 |
$ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
368 |
32a343883b74769118bb1d3b4b1fbf9156f4dddc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
369 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
370 |
$ hg update 1 > /dev/null 2>&1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
371 |
$ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
372 |
1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
373 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
374 |
$ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
375 |
da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
376 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
377 |
|
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
378 |
Sticky subrepositorys, file changes |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
379 |
$ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
380 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
381 |
$ git add f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
382 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
383 |
$ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
384 |
1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
385 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
386 |
$ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
387 |
da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
388 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
389 |
$ hg update 4 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
390 |
subrepository sources for s differ |
13428
5ef29e0dd418
subrepos: print short git changeset ids
Kevin Bullock <kbullock@ringworld.org>
parents:
13417
diff
changeset
|
391 |
use (l)ocal source (da5f5b1) or (r)emote source (aa84837)? |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
392 |
l |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
393 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
394 |
$ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
395 |
4+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
396 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
397 |
$ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
398 |
da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
399 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
400 |
$ hg update --clean tip > /dev/null 2>&1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
401 |
|
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
402 |
Sticky subrepository, revision updates |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
403 |
$ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
404 |
7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
405 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
406 |
$ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
407 |
32a343883b74769118bb1d3b4b1fbf9156f4dddc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
408 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
409 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
410 |
$ git checkout aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
411 |
Previous HEAD position was 32a3438... fff |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
412 |
HEAD is now at aa84837... f |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
413 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
414 |
$ hg update 1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
415 |
subrepository sources for s differ (in checked out version) |
13428
5ef29e0dd418
subrepos: print short git changeset ids
Kevin Bullock <kbullock@ringworld.org>
parents:
13417
diff
changeset
|
416 |
use (l)ocal source (32a3438) or (r)emote source (da5f5b1)? |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
417 |
l |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
418 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
419 |
$ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
420 |
1+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
421 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
422 |
$ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
423 |
aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
424 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
425 |
|
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
426 |
Sticky subrepository, file changes and revision updates |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
427 |
$ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
428 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
429 |
$ git add f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
430 |
$ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
431 |
aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
432 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
433 |
$ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
434 |
1+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
435 |
$ hg update 7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
436 |
subrepository sources for s differ |
13428
5ef29e0dd418
subrepos: print short git changeset ids
Kevin Bullock <kbullock@ringworld.org>
parents:
13417
diff
changeset
|
437 |
use (l)ocal source (32a3438) or (r)emote source (32a3438)? |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
438 |
l |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
439 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
440 |
$ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
441 |
7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
442 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
443 |
$ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
444 |
aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
445 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
446 |
|
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
447 |
Sticky repository, update --clean |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
448 |
$ hg update --clean tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
449 |
Previous HEAD position was aa84837... f |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
450 |
HEAD is now at 32a3438... fff |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
451 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
452 |
$ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
453 |
7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
454 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
455 |
$ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
456 |
32a343883b74769118bb1d3b4b1fbf9156f4dddc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
457 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
458 |
|
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
459 |
Test subrepo already at intended revision: |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
460 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
461 |
$ git checkout 32a343883b74769118bb1d3b4b1fbf9156f4dddc |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
462 |
HEAD is now at 32a3438... fff |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
463 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
464 |
$ hg update 1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
465 |
Previous HEAD position was 32a3438... fff |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
466 |
HEAD is now at da5f5b1... g |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
467 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
468 |
$ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
469 |
1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
470 |
$ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
471 |
$ git rev-parse HEAD |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
472 |
da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
473 |
$ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13331
diff
changeset
|
474 |