#129: darcs -> svn -- conflicts in renaming
---------------------+------------------------------------------------------
Reporter: zooko | Owner: lele
Type: defect | Status: closed
Priority: major | Milestone: VersionOne
Component: tailor | Version: 0.9
Resolution: fixed | Keywords:
---------------------+------------------------------------------------------
Changes (by lele):
* status: new => closed
* resolution: => fixed
Comment:
This is fixed by current version:
{{{
2008-05-25 02:34:35 INFO: Bootstrapping "d2s" in "/tmp/t129/result"
2008-05-25 02:34:35 INFO: $ svn ls file:///tmp/t129/s
2008-05-25 02:34:35 WARNING: [Status 1]
2008-05-25 02:34:35 INFO: $ svnadmin create --fs-type fsfs /tmp/t129/s
2008-05-25 02:34:35 INFO: [Ok]
2008-05-25 02:34:35 INFO: $ svn co --quiet --ignore-externals
file:///tmp/t129/s/ /tmp/t129/result
2008-05-25 02:34:36 INFO: [Ok]
2008-05-25 02:34:36 INFO: /tmp/t129/result $ svn propset svn:ignore
--quiet _darcs
.svn
d2s.log
d2s.state
d2s.state.old
d2s.state.journal .
2008-05-25 02:34:36 INFO: [Ok]
2008-05-25 02:34:36 INFO: $ darcs changes --xml-output --repo
/tmp/t129/d --reverse 2>&1
2008-05-25 02:34:36 INFO: [Ok]
2008-05-25 02:34:36 INFO: /tmp/t129/result $ darcs initialize
2008-05-25 02:34:36 INFO: [Ok]
2008-05-25 02:34:36 INFO: /tmp/t129/result $ darcs pull --all --quiet
--match "hash
20080525002702-97f81-8ed939e0e2dac07ed465b71884dca0116acb5ed6.gz"
/tmp/t129/d 2>&1
2008-05-25 02:34:36 INFO: [Ok]
2008-05-25 02:34:36 INFO: /tmp/t129/result $ darcs changes --last 1
--xml-output 2>&1
2008-05-25 02:34:36 INFO: [Ok]
2008-05-25 02:34:36 INFO: /tmp/t129/result $ svn add --quiet --no-
auto-props --non-recursive ./a
2008-05-25 02:34:36 INFO: [Ok]
2008-05-25 02:34:36 INFO: /tmp/t129/result $ svn commit --file
/tmp/tailorzW8CcDsvn . 2>&1
2008-05-25 02:34:37 INFO: [Ok]
2008-05-25 02:34:37 INFO: /tmp/t129/result $ svn update --quiet
--ignore-externals --revision 1
2008-05-25 02:34:38 INFO: [Ok]
2008-05-25 02:34:38 INFO: Bootstrap completed
2008-05-25 02:34:38 INFO: Updating "d2s" in "/tmp/t129/result"
2008-05-25 02:34:38 INFO: /tmp/t129/result $ darcs pull --dry-run
--xml-output /tmp/t129/d 2>&1
2008-05-25 02:34:38 INFO: [Ok]
2008-05-25 02:34:38 INFO: Cached information about 3 pending
changesets
2008-05-25 02:34:38 INFO: Applying pending upstream changesets
2008-05-25 02:34:38 INFO: Changeset #1
2008-05-25 02:34:38 INFO: Changeset "c"
2008-05-25 02:34:38 INFO: /tmp/t129/result $ darcs pull --all --quiet
--match "hash
20080525002724-97f81-60d28b213d5c029ca7c6cbc0302da0c91a9a3a30.gz" 2>&1
2008-05-25 02:34:38 INFO: [Ok]
2008-05-25 02:34:38 INFO: /tmp/t129/result $ darcs changes --match
"hash 20080525002724-97f81-60d28b213d5c029ca7c6cbc0302da0c91a9a3a30.gz"
--xml-output --summ
2008-05-25 02:34:38 INFO: [Ok]
2008-05-25 02:34:38 INFO: /tmp/t129/result $ svn mv --quiet --force a
c 2>&1
2008-05-25 02:34:39 INFO: [Ok]
2008-05-25 02:34:39 INFO: /tmp/t129/result $ svn commit --file
/tmp/tailorwa_otEsvn . 2>&1
2008-05-25 02:34:40 INFO: [Ok]
2008-05-25 02:34:40 INFO: /tmp/t129/result $ svn update --quiet
--ignore-externals --revision 2
2008-05-25 02:34:41 INFO: [Ok]
2008-05-25 02:34:41 INFO: /tmp/t129/result $ svn status 2>&1
2008-05-25 02:34:41 INFO: [Ok]
2008-05-25 02:34:41 INFO:
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
2008-05-25 02:34:41 INFO: Changeset #2
2008-05-25 02:34:41 INFO: Changeset "z"
2008-05-25 02:34:41 INFO: /tmp/t129/result $ darcs pull --all --quiet
--match "hash
20080525002738-97f81-273258a76a7b6cb85955a52a48ff7556c4dc8405.gz" 2>&1
2008-05-25 02:34:41 INFO: [Ok]
2008-05-25 02:34:41 WARNING: Conflict after 'darcs pull': ./a ./c
2008-05-25 02:34:41 INFO: /tmp/t129/result $ darcs changes --match
"hash 20080525002738-97f81-273258a76a7b6cb85955a52a48ff7556c4dc8405.gz"
--xml-output --summ
2008-05-25 02:34:41 INFO: [Ok]
2008-05-25 02:34:41 INFO: Reverting changes to ./a ./c, to solve the
conflict
2008-05-25 02:34:41 INFO: /tmp/t129/result $ darcs revert --all ./a
./c
2008-05-25 02:34:41 INFO: [Ok]
2008-05-25 02:34:41 INFO: /tmp/t129/result $ svn mv --quiet --force c
a 2>&1
2008-05-25 02:34:42 INFO: [Ok]
2008-05-25 02:34:42 INFO: /tmp/t129/result $ svn commit --file
/tmp/tailortldgqnsvn . 2>&1
2008-05-25 02:34:43 INFO: [Ok]
2008-05-25 02:34:43 INFO: /tmp/t129/result $ svn update --quiet
--ignore-externals --revision 3
2008-05-25 02:34:44 INFO: [Ok]
2008-05-25 02:34:44 INFO: /tmp/t129/result $ svn status 2>&1
2008-05-25 02:34:44 INFO: [Ok]
2008-05-25 02:34:44 INFO:
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
2008-05-25 02:34:44 INFO: Changeset #3
2008-05-25 02:34:44 INFO: Changeset "fix conflict"
2008-05-25 02:34:44 INFO: /tmp/t129/result $ darcs pull --all --quiet
--match "hash
20080525002849-97f81-29ca1474fa8f3bfc7a21cc9d0254d3a2b7eaecfd.gz" 2>&1
2008-05-25 02:34:44 INFO: [Ok]
2008-05-25 02:34:44 INFO: /tmp/t129/result $ darcs changes --match
"hash 20080525002849-97f81-29ca1474fa8f3bfc7a21cc9d0254d3a2b7eaecfd.gz"
--xml-output --summ
2008-05-25 02:34:44 INFO: [Ok]
2008-05-25 02:34:44 INFO: /tmp/t129/result $ svn mv --quiet --force a
z 2>&1
2008-05-25 02:34:45 INFO: [Ok]
2008-05-25 02:34:45 INFO: /tmp/t129/result $ svn commit --file
/tmp/tailorw5Etjnsvn . 2>&1
2008-05-25 02:34:46 INFO: [Ok]
2008-05-25 02:34:46 INFO: /tmp/t129/result $ svn update --quiet
--ignore-externals --revision 4
2008-05-25 02:34:47 INFO: [Ok]
2008-05-25 02:34:47 INFO: /tmp/t129/result $ svn status 2>&1
2008-05-25 02:34:47 INFO: [Ok]
2008-05-25 02:34:47 INFO:
-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
2008-05-25 02:34:47 INFO: Update completed, now at revision "fix
conflict"
}}}
--
Ticket URL: <http://progetti.arstecnica.it/tailor/ticket/129#comment:2>
Tailor <http://progetti.arstecnica.it/tailor>
An inter-VCs changeset exchanger
_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
