tests/test-evolve-content-divergent-meta.t
branchmercurial-4.6
changeset 5163 1752a2e7a226
parent 4673 3ef4980353af
parent 5079 1f92a6aa40d6
child 5368 844b1ad5b34b
equal deleted inserted replaced
5162:a7fb433faab6 5163:1752a2e7a226
   113   > hg ci -m "added "$ch
   113   > hg ci -m "added "$ch
   114   > done;
   114   > done;
   115 
   115 
   116   $ hg amend -m "updated c"
   116   $ hg amend -m "updated c"
   117   $ hg up -r 'desc("added c")' --hidden -q
   117   $ hg up -r 'desc("added c")' --hidden -q
   118   updated to hidden changeset 2b3c31fe982d
   118   updating to a hidden changeset 2b3c31fe982d
   119   (hidden revision '2b3c31fe982d' was rewritten as: 464e35020fd0)
   119   (hidden revision '2b3c31fe982d' was rewritten as: 464e35020fd0)
   120   working directory parent is obsolete! (2b3c31fe982d)
   120   working directory parent is obsolete! (2b3c31fe982d)
   121   $ echo coco > c
   121   $ echo coco > c
   122 
   122 
   123 1) when one user is different wrt base
   123 1) when one user is different wrt base