tests/test-merge8.t
author Pierre-Yves David <pierre-yves.david@fb.com>
Thu, 16 Oct 2014 23:10:44 -0700
changeset 23162 69524a05a7fa
parent 16913 f2719b387380
child 34661 eb586ed5d8ce
permissions -rw-r--r--
revset-rangeset: call 'getset' on a 'fullreposet' Calling 'baseset(repo.changelog)' builds a list for all revisions in the repo. And we already have the lazy and efficient 'fullreposet' class for this purpose. This gives us the usual benefit ofs the fullreposet: revset) 10:100 before) wall 0.002774 comb 0.000000 user 0.000000 sys 0.000000 (best of 797) after) wall 0.001977 comb 0.000000 user 0.000000 sys 0.000000 (best of 1244) revset) parents(10):parents(100) before) wall 0.005054 comb 0.000000 user 0.000000 sys 0.000000 (best of 481) after) wall 0.002060 comb 0.000000 user 0.000000 sys 0.000000 (best of 1056)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11981
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     1
Test for changeset ba7c74081861
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     2
(update dirstate correctly for non-branchmerge updates)
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     3
  $ hg init a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     4
  $ cd a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     5
  $ echo a > a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     6
  $ hg add a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     7
  $ hg commit -m a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     8
  $ cd ..
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
     9
  $ hg clone a b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    10
  updating to branch default
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    11
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    12
  $ cd a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    13
  $ hg mv a b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    14
  $ hg commit -m move
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    15
  $ echo b >> b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    16
  $ hg commit -m b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    17
  $ cd ../b
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    18
  $ hg pull ../a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    19
  pulling from ../a
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    20
  searching for changes
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    21
  adding changesets
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    22
  adding manifests
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    23
  adding file changes
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    24
  added 2 changesets with 2 changes to 1 files
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    25
  (run 'hg update' to get a working copy)
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    26
  $ hg update
518b90d66fad tests: unify test-merge8
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 3389
diff changeset
    27
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 11981
diff changeset
    28
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 11981
diff changeset
    29
  $ cd ..