Hi there,
> Ah... iirc this is a bug that happens when you have externals. Can you
> remove the externals and try it? You can always put them back later.
For some reason, even without removing the externals, an extran cleanup of both
the branch and the trunk now seems to have done the trick. All
> Hi there,
> > Are you using externals?
>
> Yes, we use externals both for importing code from other repos and also as
> symbolic links within our repo, since our build system runs on Windows
> which has no support for native symbolic links.
>
> Thanks!
Ah... iirc this is a bug that happens whe
Hi there,
> Are you using externals?
Yes, we use externals both for importing code from other repos and also as
symbolic links within our repo, since our build system runs on Windows which
has no support for native symbolic links.
Thanks!
Carles
> You can always create a repo on your local machine. I doubt that the
> protocol has anything to do with your issue.
True, I will try this and report back.
Thanks!
Carles
> Hi there,
> > You don't say if you are
> > branching from a working copy or using a URL.
>
> I deleted the properties from the trunk, commited that, then went:
>
> svn cp http://myrepo/trunk http://myrepo/newbranch
>
> Then I checked out newbranch, worked on it and went:
>
> Newbranch$ svn me
On 18-May-10 18:22, Cufi, Carles wrote:
Then I checked out newbranch,
In our series of bleeding obvious questions: you did check out to a new
working copy, right? It would be hard to do otherwise.
On 18-May-10 15:12, Cufi, Carles wrote:
> something relatively similar happening, where svn:mer
> > Can you create a new repository... import your project in, create a
> > branch, do a merge and duplicate this? If so... show ALL the commands
> that
> > you did from creating the repo into a script. I'm guessing there is some
> > command or something you do and we are not seeing the full pictur
Hi there,
> You don't say if you are
> branching from a working copy or using a URL.
I deleted the properties from the trunk, commited that, then went:
svn cp http://myrepo/trunk http://myrepo/newbranch
Then I checked out newbranch, worked on it and went:
Newbranch$ svn merge http://myrepo/trun
Hi there,
Thanks for your reply.
> Can you create a new repository... import your project in, create a
> branch, do a merge and duplicate this? If so... show ALL the commands that
> you did from creating the repo into a script. I'm guessing there is some
> command or something you do and we are
> > I'm in the same environment as you describe, but the only times
> > svn:mergeinfo mysteriously reappear is when using svn copy, not merges.
>
> That's interesting. So you have something relatively similar happening,
> where svn:mergeinfo reappears after deleting it? It could be related I
> gue
Hi Stein,
> I'm in the same environment as you describe, but the only times
> svn:mergeinfo mysteriously reappear is when using svn copy, not merges.
That's interesting. So you have something relatively similar happening, where
svn:mergeinfo reappears after deleting it? It could be related I gue
I'm in the same environment as you describe, but the only times
svn:mergeinfo mysteriously reappear is when using svn copy, not merges.
On 18-May-10 10:04, Cufi, Carles wrote:
And then the original bunch of 60 odd files get the svn:mergeinfo property
added.
Maybe because amongst the unmerged
Hi there,
I have read all the info I have been able to found with Google regarding
svn:mergeinfo but I have come across a case that does not seem to be covered in
the internet archives.
I had 60 odd files sparsely distributed in my trunk which contained the
svn:mergeinfo property (from a part
13 matches
Mail list logo
