Thanks . :) I've gone with "mine full" and hopefully everything will be fine when I merge back into the trunk ....
Robby On Mon, Jul 27, 2009 at 7:57 AM, Noel Welsh<noelwe...@gmail.com> wrote: > Perhaps the revision dates from before svn 1.5, which added (some) > merge tracking, and uses the mergeinfo property to store this > information. More info here: > > http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html > > The standard solution is to beat your head against the desk and curse > the Subversion developers. > > N. > > On Sun, Jul 26, 2009 at 10:43 PM, Robby > Findler<ro...@eecs.northwestern.edu> wrote: >> Anyone understand svn merging enough to be able to decode this error >> message? I was doing a merge from some (old....) code that I wanted to >> get back to (figuring that a merge was the way to get started). >> >> Conflict for property 'svn:mergeinfo' discovered on 'stxclass/main.ss'. >> They want to delete the property, you want to change the value to >> '/trunk/collects/stxclass/main.ss:4-13254,13911-13980'. >> Select: (p) postpone, (mf) mine-full, (tf) theirs-full, >> (h) help for more options: >> >> >> Robby >> _________________________________________________ >> For list-related administrative tasks: >> http://list.cs.brown.edu/mailman/listinfo/plt-dev >> > _________________________________________________ For list-related administrative tasks: http://list.cs.brown.edu/mailman/listinfo/plt-dev
