update suggests merge, merge suggests update...
Marcin Kasperski
Marcin.Kasperski at softax.com.pl
Fri Feb 15 08:11:18 CST 2008
Rumko <rumcic at gmail.com> writes:
> AFAIK, "hg heads" gives you the needed info (the changeset with which to merge,
> just search for the commits within the same branch in the output of "hg
> heads")
hg heads correctly reports 142 and 137. But my working dir is not at
any of those (it is at 127 ATM)... After I do 'hg up -r 137', merge
works.
The true (only) problem here is that error messages are confusing
--
----------------------------------------------------------------------
| Marcin Kasperski | A process that is too complex will fail.
| http://mekk.waw.pl | (Booch)
| |
----------------------------------------------------------------------
More information about the Mercurial
mailing list