On Mon, Nov 10, 2014 at 11:46 AM, Jan Nijtmans <jan.nijtm...@gmail.com> wrote:
> 2014-11-09 8:45 GMT+01:00 Baruch Burstein <bmburst...@gmail.com>: > > I am looking at that commit now. It seems that you changed files within a > > tag. How would you suggest I handle a situation like that? As far as I > > understand, once a revision is "tagged" (that is, copied to the "tags" > > directory), the files in it shouldn't be touched. Doing so violates the > idea > > of a "tag". > > Pleading guilty ;-) > > https://sourceforge.net/p/tkimg/code/70/ > > tkimg's subversion repository was converted from CVS, I used commits > 70/71/72 > to restructure a bit after the conversion. For example the CVS->SVN > conversion > left everyting in /trunk/tkimg, I just prefered everything directly under > trunk. > > Commit 70 moved everything under "/trunk/tkimg/" directly under "trunk". In > the same commit I added svn properties to other branches, so - indeed - > this is a challenging test-case..... I would expect this single svn commit > result in 5 separate fossil commits, all with the same "svn-rev-70" tag > (fossil doesn't have problem giving the same tag to multiple commits). > One commit handles all changes in trunk, one commit handles all > changes in the "img-base" branch, and then 3 remaining commits > handling tags "img-1.2.4", "img-1-3" and "img-1-3-rc2". Those > latter 3 should all become branches in fossil, I guess. > > Don't know if its possible to do that, I tried it already using GIT > as intermediate step. That didn't work, obviously ...... > > Hoping this gives you a hint how to proceed. > I came back to this thread now to try to implement all the cases discussed here, and rereading it now, it occurs to me that for a case such as yours, perhaps the correct approach is not to go out of the way to handle every crazy nonstandard case, but rather to start the export from the revision after the restructuring. Not sure that would work any better, though. -- ˙uʍop-ǝpısdn sı ɹoʇıuoɯ ɹnoʎ 'sıɥʇ pɐǝɹ uɐɔ noʎ ɟı
_______________________________________________ fossil-dev mailing list fossil-dev@lists.fossil-scm.org http://sqlite.org:8080/cgi-bin/mailman/listinfo/fossil-dev