ApacheCon: Getting the word out internally
Dear Apache Enthusiast,
As you are no doubt already aware, we will be holding ApacheCon in
Seville, Spain, the week of November 14th, 2016. The call for papers
(CFP) for this event is now open, and will remain open until
September 9th.
The event is divid
On Jul 18, 2016, at 9:49, Andreas Stieger wrote:
> I wrote nothing of GUI.
Doh! I just saw the “UI” in capital letters and complete missed the “cli” in
lower case that preceded it - sorry about that! Anyway, I’m no closer in
resolving this merge issue, but will attempt to merge the revisions
Hello,
> > Ideally use svn cli UI only.
>
> Really? I’ve had better luck using the CLI for merges. So what GUI do you
> recommend using on Linux?
I wrote nothing of GUI.
Andreas
On Jul 18, 2016, at 3:00, Andreas Stieger wrote:
> Commonly caused by explicit subtree mergeinfo. Check for svn:mergeinfo
> properties set on subtrees for both the merge source and the merge target.
Unfortunately that’s not the case here. While there was one svn:mergeinfo
property in a subtre
> $ svn pg svn:mergeinfo | grep branchA
> /branches/branchA:28000-29203
> $ svn pe svn:mergeinfo .
> Set new value for property 'svn:mergeinfo' on '.'
> $ svn pg svn:mergeinfo | grep branchA
> /branches/branchA:15542-29203
> $ svn mergeinfo ^/branches/branchA --show-revs=eligible
> [100’s of revi
