i want to get the difference between HEAD and wc into the wc.
using a 2-way-merge, the revision 100 is not important to me as end
user.
i mean, i know(100 in your example, i could also do a 3-way merge) or
assume (HEAD if i don't know any better) a base revision.
--- Greg Hudson ghudson@MIT.EDU wrote:
On Sat, 2003-01-25 at 12:26, solo turn wrote:
but the .svn can be recreated. and the wc can be fixed by merging
in
the changes if something is there, or by just recreating the
files/folders.
Uh, no. You can't merge in the changes without a base revision.
For
example:
% svn co -r 100 url foo
% cd foo
% svn cat -r 50 bar bar
% dd if=/dev/random of=.svn/entries bs=1k count=10
% svn update bar
How is Subversion supposed to know what to do here? The right
answer is
to merge the differences between rev 100 and rev HEAD of bar into
the
current contents (which are the contents of rev 50), but you've
taken
away the knowledge that rev 100 is the starting point.
__________________________________________________
Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.
http://mailplus.yahoo.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 14 02:17:37 2006