I didn't see any conflicts listed. But I ended up reverting the "svn move" and just manually deleting the files from their original paths, and adding them in the new locaton. So the history got lost in those cases. If this happens again, I'll try to investigate further..
On 10/10/06, Jim Grandy <[EMAIL PROTECTED]> wrote: > It looks like you resolved your problem (I see a checkin), but to > answer the question, make sure you don't have any 'C' status marks in > 'svn status'. > > On Oct 10, 2006, at 2:44 PM, Henry Minsky wrote: > > > In svn that is... > > > > I am trying to submit a change in which I did an "svn move", and I get > > this informative error > > from TortoiseSVN > > > > Error: Commit failed (details follow): > > Error: MERGE request failed on '/openlaszlo/branches/legals' > > Error: MERGE of '/openlaszlo/branches/legals': 409 Conflict > > (http://svn.openlaszlo.org) > > > > > > I am not sure what it is trying to tell me ... I assume it is the file > > that I moved, but > > the error message is not giving me a pathname > > > > > > > > > > -- > > Henry Minsky > > Software Architect > > [EMAIL PROTECTED] > > > > _______________________________________________ > > Laszlo-dev mailing list > > [email protected] > > http://www.openlaszlo.org/mailman/listinfo/laszlo-dev > > -- Henry Minsky Software Architect [EMAIL PROTECTED] _______________________________________________ Laszlo-dev mailing list [email protected] http://www.openlaszlo.org/mailman/listinfo/laszlo-dev
