view tests/test-resolve @ 9814:5070e4d57276

buildrpm: enhance changelog of the RPM file

Now the changelog is different depending if the parent is tagged:
- for tags, keep the previous content, i.e. changelog of the tags.
- for nightly build, changelog of the changesets since the latest tag

As RPM is expecting strictly descending dates, I have used a python
script to reorder the mercurial changelog.

#!/bin/sh

# test that a commit clears the merge state.

hg init repo
cd repo

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

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

echo % create a second head
hg up -C 0
echo baz >> file
hg commit -Am 'append baz'

echo % failing merge
HGMERGE=internal:fail hg merge

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

echo % resolve -l, should be empty
hg resolve -l