l merge, I need to have a copy of the original
>
> diff3 -A -m filea.cpp(mine) filea.cpp(orig) filea.cpp(theirs) >
> filea.cpp(merged)
>
> In subversion 1.6, I found the path to the original file under
> .svn/text-base/filea.cpp.svn-base
>
> But with version 1.7 and
ound the path to the original file under
.svn/text-base/filea.cpp.svn-base
But with version 1.7 and wc-ng, finding the pristine file is more complicated.
Do I have to learn how to read wc-ng? Or is there any easier way?
Thanks,
Curtis Zimmerman
NASA MSFC EV42
(256) 544-6970
(256) 520-2062 Cell
Hi Hyrum,
Thanks for this. I will continue inline if you allow.
The default (and only method supported in 1.7) will be a .svn directory at the
root of the working copy. As with previous versions of Subversion, please
don't manually move or edit the contents of the .svn directory.
My inte
On Feb 16, 2010, at 11:58 AM, Radomir Zoltowski wrote:
> All,
>
> I am reading WC-NG design from
> http://svn.apache.org/repos/asf/subversion/trunk/notes/wc-ng/design. I expect
> deployment of 1.7.x in my environment mid this year, therefore, I would ask a
> few quest
All,
I am reading WC-NG design from
http://svn.apache.org/repos/asf/subversion/trunk/notes/wc-ng/design. I
expect deployment of 1.7.x in my environment mid this year, therefore, I
would ask a few questions here. This is purely administrative approach,
which by some may be considered
