Mercurial > hg
annotate tests/test-revlog-packentry.t @ 13857:ba1f98f877ec
subrepo: process merge substate in sorted order in submerge()
This ensures that subrepositories are pulled in a well defined
order when cloning the parent repository.
BEFORE:
$ hg clone http://hg.gerg.ca/allextensions
destination directory: allextensions
requesting all changes
adding changesets
adding manifests
adding file changes
added 10 changesets with 20 changes to 6 files
updating to branch default
pulling subrepo caseguard from http://bitbucket.org/alexandru/caseguard
real URL is https://bitbucket.org/alexandru/caseguard
requesting all changes
adding changesets
adding manifests
adding file changes
added 81 changesets with 100 changes to 13 files
pulling subrepo hg-prompt from http://bitbucket.org/sjl/hg-prompt
real URL is https://bitbucket.org/sjl/hg-prompt
requesting all changes
adding changesets
adding manifests
adding file changes
added 114 changesets with 176 changes to 35 files
pulling subrepo hgpaste from http://bitbucket.org/birkenfeld/hgpaste
real URL is https://bitbucket.org/birkenfeld/hgpaste
requesting all changes
adding changesets
adding manifests
adding file changes
added 18 changesets with 18 changes to 2 files
...
AFTER:
$ hg clone http://hg.gerg.ca/allextensions
destination directory: allextensions
requesting all changes
adding changesets
adding manifests
adding file changes
added 10 changesets with 20 changes to 6 files
updating to branch default
pulling subrepo Artemis from http://hg.mrzv.org/Artemis
requesting all changes
adding changesets
adding manifests
adding file changes
added 55 changesets with 108 changes to 47 files
...
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Sun, 03 Apr 2011 01:57:17 +0200 |
parents | 67fb33eb3add |
children | ec5886db9dc6 |
rev | line source |
---|---|
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
1 $ hg init repo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
2 $ cd repo |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
3 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
4 $ touch foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
5 $ hg ci -Am 'add foo' |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
6 adding foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
7 |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
8 $ hg up -C null |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
9 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
11 this should be stored as a delta against rev 0 |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
13 $ echo foo bar baz > foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
14 $ hg ci -Am 'add foo again' |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
15 adding foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
16 created new head |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
17 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
18 $ hg debugindex .hg/store/data/foo.i |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
19 rev offset length base linkrev nodeid p1 p2 |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
20 0 0 0 0 0 b80de5d13875 000000000000 000000000000 |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
21 1 0 24 0 1 0376abec49b8 000000000000 000000000000 |