On Thu, Aug 25, 2005 at 10:17:02AM +0200, Lele Gaifax wrote: > >>>>> "Nathan" == Nathan Gray <[EMAIL PROTECTED]> writes: > > Nathan> Say I have a darcs patch called 'my darcs patch', which > Nathan> updates README. I record it in darcs, then make a few > Nathan> more edits to README and record in patch 'my second > Nathan> patch'. > > Nathan> I then use tailor to sync from darcs to CVS. All good so > Nathan> far. Both patches are applied and committed to CVS. > > Nathan> When I use tailor to sync from CVS back to darcs, > Nathan> "duplicate" patches for 'my darcs patch' and 'my second > Nathan> patch' get created, except they are not the same as the > Nathan> original darcs patches. The new 'my darcs patch' is the > Nathan> inverse of 'my second patch'. > > Nathan> I believe this is because the hybrid repository accepts > Nathan> each patch from darcs, then when the CVS revisions are > Nathan> fetched, the first revision sets the hybrid repository to > Nathan> the state it was in after only one patch, darcs sees > Nathan> changes, and tailor generates a new darcs patch. > > I think tailor should now be able to handle this situation, evenif I > did not tried it yet: two things put it in better position, > > a) the ability to keep the two working dirs separated > b) the ability to run arbitrary transform before committing on the > target > > The idea is: one of that tranforms may be able to recognize the "my > darcs patch" coming back from CVS (in some fancy way, looking for a > special word in the log?) and skipping the re-commit on darcs target. > > But as said, there just the infrastructure, still to be tried.
I really need my repositories to be identical, which is why I have my bridge set up as a hybrid repository. What I think I would like is something similar to 'svk push': I would update from CVS to darcs. Do my work in darcs. When I am ready to commit back to CVS, I tell tailor to sync. Tailor would first check to see if there had been any updates to CVS, and pull those, creating darcs patches for each changeset. Then immediately after committing each darcs patch to CVS, tailor would check to see if there had been any updates to CVS. There would be at least one (from the patch just committed), which would be pulled back. CVS would now be happy, and darcs would detect no changes, and would also be happy. Tailor could then continue with the next darcs patch to commit to CVS. -kolibrie _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
