update suggests merge, merge suggests update...
Marcin Kasperski
Marcin.Kasperski at softax.com.pl
Fri Feb 15 05:05:12 CST 2008
Well... Mercurial 0.9.4 and some personal repo (after some pulls from
two other repos).
$ hg up
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
OK, I do not want to lose changes, so ...
$ hg merge
abort: working dir not at a head rev - use "hg update" or merge with an explicit rev
... and I am stuck, as I do not know which explicit rev should I point.
I raise this for two reasons, first to suggest that maybe those error
messages could be revisited and improved somehow, then ... because I
need suggestion how to resolve this, after all.
The exact situation is following:
$ hg id --id --num
1c6ff2b71028 127
o 142 bc549c4b3d0c
|
o 141 7684d76e0f40
|
o 140 8df199cc39d8
|
o 139 a3a45ca9f67f
|
o 138 6df78a475930
|
| o 137 855b66538741
|/|
o | 136 6fede9175f06
| |
o | 135 4457efd35d31
| |
o | 134 e26e8090ab7b
| |
o | 133 da7941363ded
| |
o | 132 eadd2f3370c3
| |
o | 131 f26df30a7e29
| |
o | 130 8c0c59ba50cd
| |
o | 129 3c2dcf2c43a8
| |
o | 128 da459beaeeac
| |
| @ 127 1c6ff2b71028
|/|
o | 126 972b5ed28913
| |
o | 125 bc578b9f566e
| |
o | 124 494b6c9dc9a1
| |
o | 123 617c773f45e5
| |
o | 122 a43abd06ffa3
| |
| o 121 543a98c07456
|/
o 120 a80c83017b6f
|
o 119 da253d18bebb
|
PS Well, OK, I suppose hg up -r 137 may help...
--
----------------------------------------------------------------------
| Marcin Kasperski | I have a very small head and I had better learn
| http://mekk.waw.pl | to live with it and to respect my limitations,
| | rather than to try to ignore them. (Dijskstra)
----------------------------------------------------------------------
More information about the Mercurial
mailing list