--- a/tests/test-obsolete.t Tue Jul 10 16:14:29 2012 +0200
+++ b/tests/test-obsolete.t Wed Jul 11 15:20:22 2012 +0200
@@ -118,6 +118,7 @@
$ hg up 3 -q
Working directory parent is obsolete
$ mkcommit d # 5 (on 3)
+ 1 new unstables changesets
$ qlog -r 'obsolete()'
3
- 0d3f46688ccc
@@ -190,6 +191,7 @@
Working directory parent is obsolete
$ mkcommit obsol_d # 6
created new head
+ 1 new unstables changesets
$ hg debugobsolete `getid 5` `getid 6`
$ qlog
6
@@ -245,6 +247,7 @@
Working directory parent is obsolete
$ mkcommit "obsol_d'" # 7
created new head
+ 1 new unstables changesets
$ hg debugobsolete `getid 6` `getid 7`
$ hg pull -R ../other-new .
pulling from .
@@ -328,6 +331,7 @@
Working directory parent is obsolete
$ mkcommit "obsol_d''"
created new head
+ 1 new unstables changesets
$ hg debugobsolete `getid 7` `getid 8`
$ cd ../other-new
$ hg up -q 3
@@ -500,6 +504,7 @@
$ cd local
$ hg phase --public 11
+ 1 new latecomers changesets
$ hg --config extensions.graphlog=glog glog --template='{rev} - ({phase}) {node|short} {desc}\n'
@ 12 - (draft) 6db5e282cb91 add obsol_d'''
|
@@ -590,3 +595,24 @@
9468a5f5d8b2 6db5e282cb91
95de7fc6918d 909a0fb57e5d
a7a6f2b5d8a5 95de7fc6918d
+
+Check conflict detection
+
+ $ hg up 9468a5f5d8b2 # add obsol_d''
+ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ mkcommit "obsolet_conflicting_d"
+ $ hg summary
+ parent: 14:50f11e5e3a63 tip
+ add obsolet_conflicting_d
+ branch: default
+ commit: (clean)
+ update: 9 new changesets, 9 branch heads (merge)
+ $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
+ $ hg log -r 'conflicting()'
+ changeset: 14:50f11e5e3a63
+ tag: tip
+ parent: 11:9468a5f5d8b2
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add obsolet_conflicting_d
+