view tests/test-resolve.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
  ...

test that a commit clears the merge state.

  $ hg init repo
  $ cd repo

  $ echo foo > file
  $ hg commit -Am 'add file'
  adding file

  $ echo bar >> file
  $ hg commit -Am 'append bar'


create a second head

  $ hg up -C 0
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo baz >> file
  $ hg commit -Am 'append baz'
  created new head

failing merge

  $ hg merge --tool=internal:fail
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
  [1]

  $ echo resolved > file
  $ hg resolve -m file
  $ hg commit -m 'resolved'

resolve -l, should be empty

  $ hg resolve -l

test crashed merge with empty mergestate

  $ mkdir .hg/merge
  $ touch .hg/merge/state

resolve -l, should be empty

  $ hg resolve -l