Na Fri, Jun 15, 2007 at 02:24:57AM +0200, VMiklos <[EMAIL PROTECTED]> pisal(a): > i know it. though i provided that pulling a few patches (usually two) is > enough to avoid a conflict i think something like: > > n=1 > while true > do > try to pull n patches --dry-run && break > n++ > done > pull n patches > > should work
i've created a test repo and pushed such a conflict then tried to convert it. tailor does handle this and it does in a very efficent way: 22:41:54 [I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* 22:41:54 [I] Changeset #2 22:41:54 [I] Changeset "second line client version" 22:41:54 [I] /tmp/tmp.AxaWNa9151/darcs $ darcs pull --all --quiet --match "hash 20070615203921-e2957-3cba9d9fec6cb0b5c6c33b9 298a86aaac6360306.gz" 22:41:55 [I] [Ok] 22:41:55 [W] Conflict after 'darcs pull': ./foo.c 22:41:55 [I] /tmp/tmp.AxaWNa9151/darcs $ darcs changes --match "hash 20070615203921-e2957-3cba9d9fec6cb0b5c6c33b9298a86aaac6 360306.gz" --xml-output --summ 22:41:55 [I] [Ok] 22:41:55 [I] Reverting changes to ./foo.c, to solve the conflict it seems to work so far VMiklos -- developer of Frugalware Linux - http://frugalware.org
pgp0FwLcW0eaD.pgp
Description: PGP signature
_______________________________________________ Frugalware-devel mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-devel
