Hi,
Think I found a problem with svn 1.7.1 on Windows, where after a merge
and a tree conflict (annoying, since both dirs have same name), I ended
up with a file with status deleted (for unknown reason), and it seems
impossible to revert (undelete) this file.
I made a batch script where I be
Gunnar Dalsnes writes:
> REM change this to the dir you are running the script from
> set wd=c:/temp/test
>
> svnadmin create repo
>
> svn mkdir file:///%wd%/repo/trunk -m test
>
> svn co file:///%wd%/repo/trunk trunk1
> svn co file:///%wd%/repo/trunk trunk2
trunk2 is an empty directory at r1
>
On 10.11.2011 12:26, Philip Martin wrote:
Gunnar Dalsnes writes:
REM change this to the dir you are running the script from
set wd=c:/temp/test
svnadmin create repo
svn mkdir file:///%wd%/repo/trunk -m test
svn co file:///%wd%/repo/trunk trunk1
svn co file:///%wd%/repo/trunk trunk2
trunk2
I can make a Linux script if that will help...
On 10.11.2011 17:17, Gunnar Dalsnes wrote:
On 10.11.2011 12:26, Philip Martin wrote:
Gunnar Dalsnes writes:
REM change this to the dir you are running the script from
set wd=c:/temp/test
svnadmin create repo
svn mkdir file:///%wd%/repo/trunk -
Gunnar Dalsnes writes:
>>>
>>> REM tree conflict
>>>
>>> svn resolve --accept=working dir1
>> Did you miss a step?
> No, nothing is missed, but it seems this line is useless (but
> harmless). The problem appears regardless.
>> trunk2 is still an empty directory at r1, how can
>> that cause a co
Philip Martin writes:
> The merge creates an added directory wc/D (copied from /T/D in the
> repo). This conflicts with the directory D added by the update (which
> is /X/B in the repo) so a tree conflict is created. Note that wc/D is
Typo: /X/B should be /B/D.
> marked as replaced.
--
Phili
On 11.11.2011 16:51, Philip Martin wrote:
You can't revert wc/D/f without reverting the replace of wc/D.
Does this mean it's not possible to merge if the same dir is created
both in trunk and in branch? Can the "replace" of the "duplicate" dir be
avoided somehow? If not, it would be nice with a
On Sat, Nov 12, 2011 at 06:53:54PM +0100, Gunnar Dalsnes wrote:
> On 11.11.2011 16:51, Philip Martin wrote:
> >You can't revert wc/D/f without reverting the replace of wc/D.
> Does this mean it's not possible to merge if the same dir is created
> both in trunk and in branch? Can the "replace" of th
