Branko Čibej wrote:
> Here's a more complete proposal:
>
> Introduce two new revision keywords:
>
> * ROOT (alternatively: CREATED)
> [...]
>
> * MERGED
> Only relevant in the context of a branch. Represents the latest
> revision in which a merge was made to the branch.
On 23.10.2013 18:45, Julian Foad wrote:
> Julian Foad wrote:
>
>> Branko Čibej wrote:
>>> Another option -- somewhat less dependent on a completely new
>>> feature -- might be this:
>>>
>>> svn diff -rROOT:HEAD
>> Well, you haven't ascribed a meaning to that syntax. If you mean it should
>>
Julian Foad wrote:
> Branko Čibej wrote:
>> Another option -- somewhat less dependent on a completely new
>> feature -- might be this:
>>
>> svn diff -rROOT:HEAD
>
> Well, you haven't ascribed a meaning to that syntax. If you mean it should
> compare the "root of the branch" with the "ti
Branko Čibej wrote:
> Well, I fail to see how "use mergeinfo" is in any way intuitive of
> the proposed semantics.
It shows the diff that would be merged from the branch to the trunk if we asked
for a merge.
(Recall I did say this patch was just meant to promote discussion. I too
dislike this
On 23.10.2013 18:17, Branko Čibej wrote:
> On 23.10.2013 18:06, Julian Foad wrote:
>> Branko Čibej wrote:
>>
>>> On 23.10.2013 15:53, Julian Foad wrote:
Gabriela Gibson wrote on 13 October:
> my branch has grown into a veritable forest, and so, I thought that
> it would be convenient
On 23.10.2013 18:06, Julian Foad wrote:
> Branko Čibej wrote:
>
>> On 23.10.2013 15:53, Julian Foad wrote:
>>> Gabriela Gibson wrote on 13 October:
my branch has grown into a veritable forest, and so, I thought that
it would be convenient to present the net code changes
>>> ... and the d
Branko Čibej wrote:
> On 23.10.2013 15:53, Julian Foad wrote:
>> Gabriela Gibson wrote on 13 October:
>>> my branch has grown into a veritable forest, and so, I thought that
>>> it would be convenient to present the net code changes
>>
>> ... and the discussion went on to address how to use "sv
On 23.10.2013 15:53, Julian Foad wrote:
> Gabriela Gibson wrote on 13 October:
>> my branch has grown into a veritable forest, and so, I thought that
>> it would be convenient to present the net code changes
> ... and the discussion went on to address how to use "svn diff" in the right
> way to sh
Gabriela Gibson wrote on 13 October:
> my branch has grown into a veritable forest, and so, I thought that
> it would be convenient to present the net code changes
... and the discussion went on to address how to use "svn diff" in the right
way to show such changes, which is not exactly obvious.
On Sun, Oct 13, 2013 at 9:29 PM, Gabriela Gibson
wrote:
> On 13/10/13 15:15, Lieven Govaerts wrote:
>
> Hi Lieven,
>
>
>> The last time you updated the invoke-diff-cmd branch from trunk was in
>> rr1526487, you updated from trunk r1526439.
>
>
> Sorry, I had merged locally but not committed. (done
On 13/10/13 15:15, Lieven Govaerts wrote:
Hi Lieven,
The last time you updated the invoke-diff-cmd branch from trunk was in
rr1526487, you updated from trunk r1526439.
Sorry, I had merged locally but not committed. (done now)
So if you compare your branch to trunk@1526439 you will get a di
Hi Gabriela,
On Sun, Oct 13, 2013 at 3:52 PM, Gabriela Gibson
wrote:
> On 13/10/13 13:34, Lieven Govaerts wrote:
>
>>
>> Is this any different than running:
>> svn diff -x -pwb ^/subversion/trunk
>> ^/subversion/branches/invoke-**diff-cmd-feature
>> ?
>>
>> At this moment there is a large diff b
On 13/10/13 13:34, Lieven Govaerts wrote:
Is this any different than running:
svn diff -x -pwb ^/subversion/trunk
^/subversion/branches/invoke-diff-cmd-feature
?
At this moment there is a large diff between trunk and your branch, but
that's because you haven't brought your branch up to date wit
Hi,
On Sun, Oct 13, 2013 at 12:50 PM, Gabriela Gibson wrote:
> Hi,
>
> my branch has grown into a veritable forest, and so, I thought that
> it would be convenient to present the net code changes in a file called
> 'entire-branch-code' (attached).
>
> This is generated like so:
>
> 1) Merge tru
14 matches
Mail list logo
