tests/test-revlog-packentry.t
author Pulkit Goyal <7895pulkit@gmail.com>
Wed, 09 Sep 2020 16:49:19 +0530
changeset 45530 6877b0ee5f9d
parent 37285 d4e62df1c73d
child 49266 ccd76e292be5
permissions -rw-r--r--
mergestate: introduce a new ACTION_KEEP_NEW `ACTION_KEEP` is overloaded and it's hard to figure out how we end up with this KEEP, what was the state of things. In a previous patch, we introduced `ACTION_KEEP_ABSENT` which represents files which are kept absent in the working directory. There is another special case where we keep the file when it's not present on both ancestor and remote side. We introduce a dedicated action for that. The goal is to use these information to make bid merge smarter. Differential Revision: https://phab.mercurial-scm.org/D9002
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 11919
diff changeset
    18
  $ hg debugindex foo
37285
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37284
diff changeset
    19
     rev linkrev nodeid       p1           p2
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37284
diff changeset
    20
       0       0 b80de5d13875 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37284
diff changeset
    21
       1       1 0376abec49b8 000000000000 000000000000
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 14182
diff changeset
    22
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 14182
diff changeset
    23
  $ cd ..