echo "foo" > trunk/foo
svn add trunk/foo
svn propset svn:ignore foo trunk
svn ci -m 'stage trunk'
## stage conflicting changes in branches/a
echo "bar" > branches/a/foo
svn add branches/a/foo
svn propset svn:ignore bar branches/a
svn ci -m 'stage branches/
Anton Shepelev wrote on Sat, 28 Mar 2020 00:41 +00:00:
> Daniel Shahaf:
> > Tilde is also special to some shells, at least in the sh/csh
> > «~username» syntax and in zsh's «foo~bar» syntax (also part of
> > EXTENDED_GLOB);
>
> That is why I proposed a double `~' -- not perfect, of course, but
> I
Daniel Shahaf:
> Here are our notes about this from back when the ^/ syntax was
> added:
>
> http://svn.apache.org/viewvc/subversion/trunk/notes/cli-repo-root-relative-support.txt?view=markup#l42
It takes care of cmd.exe, so ^^/ on Windows was a deliberate
tradeoff on your part.
> Tilde is also
Anton Shepelev wrote on Fri, 27 Mar 2020 23:40 +00:00:
> Daniel Shahaf:
> > but in any case, this sounds quite reasonable. How about
> > assigning it the syntax «^./» (caret, dot, slash)? That way we
> > only have one "special" leading character to worry about.
>
> That ^ character must be escap
Daniel Shahaf:
> > I had already written about an extension of the caret syntax
> > to take the current working directory into account, so that,
> > being in svn/trunk/project/xml/ , one does not have to type
> >
> > svn cp ^/trunk/project/xml/1.xml ^/trunk/project/xml/2.xml
> >
> > but can si
Anton Shepelev wrote on Fri, 27 Mar 2020 01:39 +0300:
> Daniel Shahaf:
>
> > Yes, this feature won't happen unless someone invests time in
> > making it happen -- but let's not discourage people from
> > discussing feature ideas even if they may not personally have
> > time to implement them. Disc
On Thu, Mar 26, 2020 at 10:36 PM Daniel Shahaf wrote:
>
> Stefan Sperling wrote on Thu, 26 Mar 2020 21:02 +00:00:
> > The ultimate goal here is to allow users to type less characters when
> > starting merges. Scripting tab-completion for SVN URL arguments into
> > your favourite shell would also b
Daniel Shahaf:
> Yes, this feature won't happen unless someone invests time in
> making it happen -- but let's not discourage people from
> discussing feature ideas even if they may not personally have
> time to implement them. Discussions are just as useful a
> contribution as patches.
It is tru
> the heuristic fails, or morph 'svn merge' into an interactive
> question and answer game with the user, much like the conflict
> resolver can behave when it finds ambiguity trying to match up
> copies and deletions.
I do not think the first usable version should impl
Stefan Sperling wrote on Thu, 26 Mar 2020 21:02 +00:00:
> The ultimate goal here is to allow users to type less characters when
> starting merges. Scripting tab-completion for SVN URL arguments into
> your favourite shell would also be a usable and effective solution.
What would the algorithm be?
f you want to handle that then you must either error out when the
> heuristic fails, or morph 'svn merge' into an interactive question and
> answer game with the user, much like the conflict resolver can behave
> when it finds ambiguity trying to match up copies and deletions
t the regression test suite is comprehensive enough to
> catch any problems and if needed inspire further discussion about those
> problems in detail. It's hard to thoroughly evaluate your idea without
> knowing which of the test cases will break and why.
>
Stefan, this is a strawman.
as the conflict resolver demonstates.
You're not taking cases into account where multiple copies within a
signle revision correspond to a single deletion.
So if you want to handle that then you must either error out when the
heuristic fails, or morph 'svn merge' into an interactive q
> 1. In repository restructurings, such as running «svn merge» in a
> > > working copy of ^/thebarproject/trunk after that project had been
> > > renamed from ^/thefooproject/trunk. Under the proposal, that
> > > would attempt to merge from ^/thefooproject/trunk, and
On Thu, Mar 26, 2020 at 01:10:25AM +0300, Anton Shepelev wrote:
> Daniel Shahaf:
> > however, I don't think the lack of these distinctions is
> > necessarily a blocker. It just means we need to be more careful
> > about not writing automation that will help some cases and
> > backfire in others.
>
On Thu, Mar 26, 2020 at 01:10:25AM +0300, Anton Shepelev wrote:
> Daniel Shahaf:
> > However, I can also see circumstances in which this smartness
> > could be counter-productive:
> >
> > 1. In repository restructurings, such as running «svn merge» in a
> > work
> > and use that as the URL to merge from" wouldn't necessarily be
> > correct.
>
> I fear I do not understand this case. Can you please post a
> sequence of svn commands that reproduce it, even as Stefan did
> above?
Sure:
svn cp ^/trunk ^/branches/foo
svn
Daniel Shahaf:
> Stefan Sperling wrote on Wed, 25 Mar 2020 15:07 +0100:
> > On Wed, Mar 25, 2020 at 04:45:29PM +0300, Anton Shepelev wrote:
> > > Why does even the basic sync-merging require that the user
> > > specify the source URL, as in:
> > >
> > &g
Stefan Sperling wrote on Wed, 25 Mar 2020 15:07 +0100:
> On Wed, Mar 25, 2020 at 04:45:29PM +0300, Anton Shepelev wrote:
> > Hello, all
> >
> > Why does even the basic sync-merging require that the user
> > specify the source URL, as in:
> >
> > svn merg
On Wed, Mar 25, 2020 at 04:45:29PM +0300, Anton Shepelev wrote:
> Hello, all
>
> Why does even the basic sync-merging require that the user
> specify the source URL, as in:
>
> svn merge ^/project/trunk
>
> I think this requirement is redundant because SVN know
>
Hello, all
Why does even the basic sync-merging require that the user
specify the source URL, as in:
svn merge ^/project/trunk
I think this requirement is redundant because SVN know
exactly from which original original directory the branch
was created by svn cp. Will you consider simplifying
Thanks Stefan.
The command is svn status :-)
I will script something around this to show tgis information and revert.
Thanks,
Amit Katekar.
Sent from ProtonMail mobile
Original Message
On Apr 6, 2018, 8:38 AM, Stefan Sperling wrote:
> On Fri, Apr 06, 2018 at 09:19:46AM -0400
On Fri, Apr 06, 2018 at 09:19:46AM -0400, Kaptaan wrote:
> I would like to see the message "> Local file obstruction, incoming file add
> upon merge" during the dryrun option. Is there anyway we can have the reason
> of the conflict show in a dry-run or even in the actual merge in the
> non-inte
a conflict and
what steps they should take.
svn merge $UAT_PROJECTS_SVNREP . -c105914 --dry-run
--- Merging r105914 into '.':
C src/app/cobol/batch/AE0010I2.pco
C src/app/cobol/batch/AKCALACU.cbl
C src/app/cobol/batch/SMTEST1
C src/app/cobol/batch/SMTEST2
C src/app/cobo
On Fri, Dec 15, 2017 at 2:15 AM, wuzhouhui <1530108...@qq.com> wrote:
> Hi, what is difference between
> svn merge
> and
> svn merge --reintegrate
> when merging branch into trunk for svn-1.6? Any examples?
First of all, SVN 1.6 is no longer supported, and as of 1
Hi, what is difference between
svn merge
and
svn merge --reintegrate
when merging branch into trunk for svn-1.6? Any examples?
Thanks.
On 10/26/2017 06:21 PM, Stefan Sperling wrote:
On Thu, Oct 26, 2017 at 05:44:16PM +0800, wuzhouhui wrote:
There is no option --no-ancestry for subcommand merge, I think option
--ignore-ancestry is what you talk about.
Correct. Sorry about that.
I run "svn merge --ignore-ancestry&quo
On Thu, Oct 26, 2017 at 05:44:16PM +0800, wuzhouhui wrote:
> There is no option --no-ancestry for subcommand merge, I think option
> --ignore-ancestry is what you talk about.
Correct. Sorry about that.
> I run "svn merge --ignore-ancestry" and got this:
> svn:
There is no option --no-ancestry for subcommand merge, I think option
--ignore-ancestry is what you talk about.
I run "svn merge --ignore-ancestry" and got this:
svn: E24: Cannot merge automatically while ignoring mergeinfo
On 10/26/2017 05:33 PM, Stefan Sperling wrote:
On T
On Thu, Oct 26, 2017 at 04:39:11PM +0800, wuzhouhui wrote:
> I'm wondering if higher Subversion client can disable some features for
> compatible with older Subversion server.
The --no-ancestry option disables merge-tracking on the client.
You could try again with 'svn merge --no
users@subversion.apache.org
Subject: svn merge failed
Hi,
I run "svn merge" in my working copy, but I got
svn: E27: Querying mergeinfo requires version 3 of the FSFS
filesystem schema; filesystem '/home/svn/vsds_source/db' uses only version
2
Subversion client-side version is 1.9.7, wh
> -Original Message-
> From: wuzhouhui [mailto:1530108...@qq.com]
> Sent: donderdag 26 oktober 2017 07:36
> To: users@subversion.apache.org
> Subject: svn merge failed
>
> Hi,
>
> I run "svn merge" in my working copy, but I got
>
> svn: E20
Hi,
I run "svn merge" in my working copy, but I got
svn: E27: Querying mergeinfo requires version 3 of the FSFS
filesystem schema; filesystem '/home/svn/vsds_source/db' uses only version 2
Subversion client-side version is 1.9.7, while server-side is
Thank you, Brane. You are right.
From: Branko Čibej
To: users@subversion.apache.org
Sent: Saturday, November 26, 2016 9:31 AM
Subject: Re: SVN merge between branches is actually overwrite?
On 26.11.2016 14:49, James wrote:
> I just found if I merge branch B to branch A, the
On Sat, Nov 26, 2016 at 01:49:00PM +, James wrote:
> I just found if I merge branch B to branch A, the two branches will become
> the same. changes in branch A will gone. Is this by design? or I did
> something wrong? I am using the latest Tortoise.
>
>
> I did more than once with the instr
On 26.11.2016 14:49, James wrote:
> I just found if I merge branch B to branch A, the two branches will become
> the same. changes in branch A will gone. Is this by design? or I did
> something wrong? I am using the latest Tortoise.
>
>
> I did more than once with the instruction found online:
>
I just found if I merge branch B to branch A, the two branches will become the
same. changes in branch A will gone. Is this by design? or I did something
wrong? I am using the latest Tortoise.
I did more than once with the instruction found online:
In the From URL option, you should mention th
fan
> > > I gave it a try (r1763039) and it is not different from what I see with
> > > 1.9.x: the files that were renamed on the branch are still copied from the
> > > branch, not renamed on the trunk.
> > > I.e.,
> > >
> > > svn cp $SVNREPO
/trunk
cd trunk
svn merge ^/branch/x
svn info bar.c
The last command shows bar.c as being copied, without any changes, from
^/branch/x/bar.c - rather than being copied from ^/trunk/bar.c and modified.
And, since there are no changes in the diff, ReviewBoard shows nothing in
the diff for bar.c.
You&#x
nch/x
> svn co $SVNREPO/branch/x
> cd x
> svn mv foo.c bar.c
> vi bar.c
> svn ci
> cd ..
> rm -rf x
> svn co $SVNREPO/trunk
> cd trunk
> svn merge ^/branch/x
> svn info bar.c
>
> The last command shows bar.c as being copied, without any changes, from
>
t
displaying the moved/copied files. However:
- If one does 'svn merge --reintegrate', Subversion will copy new files from
the branch unchanged, and 'svn diff' will not show them (and hence, RB won't
either) - or, with --show-copies-as-adds, it will show them as being a
accurate when cherry-picks or subtree
> > merges hapepned.)
> There's one more issue with these approaches. ReviewBoard can be smart about
> displaying the moved/copied files. However:
>
> - If one does 'svn merge --reintegrate', Subversion will copy new files from
> t
branch.
("Approximately" because this is inaccurate when cherry-picks or subtree
merges hapepned.)
There's one more issue with these approaches. ReviewBoard can be smart
about displaying the moved/copied files. However:
- If one does 'svn merge --reintegrate', Subversion wi
Johan Corveleyn wrote on Mon, Sep 26, 2016 at 13:04:04 +0200:
> Maybe I'm missing something, but I don't understand why 'svn diff
> --old=TRUNK --new=BRANCH' would show you things that you previously
> merged from TRUNK to BRANCH. It should show exactly the content-wise
> difference between TRUNK a
On Mon, Sep 26, 2016 at 10:30 AM, Veit Guna wrote:
>> Gesendet: Montag, 26. September 2016 um 09:59 Uhr
>> Von: "Johan Corveleyn"
>> An: "Daniel Shahaf"
>> Cc: "Veit Guna" , "users@subversion.apache.org"
>>
>> Betref
On Sat, Sep 24, 2016 at 12:44 PM, Daniel Shahaf wrote:
> Veit Guna wrote on Sat, Sep 24, 2016 at 12:19:16 +0200:
>> So basically what I need is a diff that shows me the same changes that
>> would be made to trunk if the branch
>> would be merged to it (ignoring trunk changes merged to branch).
>>
Veit Guna wrote on Sat, Sep 24, 2016 at 12:19:16 +0200:
> So basically what I need is a diff that shows me the same changes that
> would be made to trunk if the branch
> would be merged to it (ignoring trunk changes merged to branch).
>
> Is this somehow possible?
Checkout trunk@HEAD, run 'merge
Hi.
Currently at work we're using git for SCM. Although coming from SVN and
having my doubts in the first place, I like it very much now.
Especially the Github style flow with PRs and reviewing makes sense.
Now in another project we're still using SVN. Here I would love to have
the same PR/review
On Wed, Sep 21, 2016 at 12:49:46PM +0200, Philippe Combes wrote:
>
> > Perhaps your changelog generator could be taught to ignore revisions
> > which changed only svn:mergeinfo properties? Would that work around
> > the problem?
>
> Stefan,
>
> Thanks again for your time.
> As you point it out,
> Perhaps your changelog generator could be taught to ignore revisions
> which changed only svn:mergeinfo properties? Would that work around
> the problem?
Stefan,
Thanks again for your time.
As you point it out, it would only be a workaround, but it sounds a good
lead. I plan to use svn2cl as t
On Wed, Sep 14, 2016 at 10:51:54AM +0200, Philippe Combes wrote:
> The only solution here is to add another option to svn merge, --block,
> with another reserved property, just as svnmerge.py used to do. I have
> no idea of how deep the impacts on the svn merge code would be (from my
&
t has been used as a
workaround to the missing functionality of purely blocking some merges,
which is clearly quite different. This missing functionality was
supported by svnmerge.py but it has been removed.
The only solution here is to add another option to svn merge, --block,
with another res
Hi
The following should be invalid IIRC, but rather than give a helpful
error, it core dumped. This is with 1.9.4 on Linux.
svn merge ^/trunk/web/file.js ^/branches/X/web/file.js
^/branches/Y/web/file.js --dry-run
svn: E235000: In file 'subversion/libsvn_subr/dirent_uri.c'
command is based on the property svn:mergeinfo, it lists all
merged revisions, even those which were added by svn merge
--record-only. In other words, it lists some modifications which were
not actually done.
Looking for a solution to this issue, I discovered the existence of the
tool svnmerge.py. If I
lists all
merged revisions, even those which were added by svn merge
--record-only. In other words, it lists some modifications which were
not actually done.
Looking for a solution to this issue, I discovered the existence of the
tool svnmerge.py. If I understand well how it used to work, two lists of
27 schrieb Bert Huijben:
-Original Message-
From: Kai Behncke [mailto:kai.behn...@uni-osnabrueck.de]
Sent: dinsdag 9 februari 2016 07:49
To: users@subversion.apache.org
Subject: Question to svn merge (merge just parts of a diff)
Dear users,
I`m quite new to svn. I would like to know it the
> -Original Message-
> From: Kai Behncke [mailto:kai.behn...@uni-osnabrueck.de]
> Sent: dinsdag 9 februari 2016 07:49
> To: users@subversion.apache.org
> Subject: Question to svn merge (merge just parts of a diff)
>
> Dear users,
>
> I`m quite new to svn.
le has the
content:
A
B
E
...that means that some changes, that I made, are overwritten now. But
that should not be.
A diff between 2 and 3 would show someting like:
A
-C
-D
+B
+E
Is there a possibility to do (for Revision 4) a "svn merge" to get a new
file, that:
* "knows
Hi,
I'm trying to understand a tree conflict problem during merge. After the merge
from an import branch to trunk the client states
"Tree conflict on 'upload.bat'
> local file edit, incoming file delete upon merge"
Normally I understand tree conflicts and generally know how to solve them. But
On Wed, Jul 8, 2015 at 6:06 AM, Philip Martin
wrote:
> Branko Čibej writes:
>
>> On 07.07.2015 19:58, Zk W wrote:
>>> Hi All
>>>
>>> We have SVN 1.6.
>>> We like to perform a svn merge on a file where its filename has spaces.
>>> eg
>
Branko Čibej writes:
> On 07.07.2015 19:58, Zk W wrote:
>> Hi All
>>
>> We have SVN 1.6.
>> We like to perform a svn merge on a file where its filename has spaces.
>> eg
>> Roaming Apple.txt
>>
>> Is this syntax correct below to svn merg
At Tue, 7 Jul 2015 10:58:33 -0700 Zk W wrote:
>
>
> Hi All
>
> We have SVN 1.6.
> We like to perform a svn merge on a file where its filename has spaces.
> eg
> Roaming Apple.txt
>
> Is this syntax correct below to svn merge to a working copy ?
> If not, what
At Tue, 7 Jul 2015 11:23:25 -0700 Zk W wrote:
>
>
> Hi Brane
>
> Thanks for responding.
>
> How about svn merging between working paths if the paths have spaces ?
> eg
>
> svn merge -c 12345 src/path to/Roaming Apple.txt /src/another path/Roaming
> Apple.tx
Hi Brane
Thanks for responding.
How about svn merging between working paths if the paths have spaces ?
eg
svn merge -c 12345 src/path to/Roaming Apple.txt /src/another path/Roaming
Apple.txt
Thanks once again.
On Tue, Jul 7, 2015 at 11:14 AM, Branko Čibej wrote:
> On 07.07.2015 19:58,
On 07.07.2015 19:58, Zk W wrote:
> Hi All
>
> We have SVN 1.6.
> We like to perform a svn merge on a file where its filename has spaces.
> eg
> Roaming Apple.txt
>
> Is this syntax correct below to svn merge to a working copy ?
> If not, what should it be ?
&g
Hi All
We have SVN 1.6.
We like to perform a svn merge on a file where its filename has spaces.
eg
Roaming Apple.txt
Is this syntax correct below to svn merge to a working copy ?
If not, what should it be ?
svn merge -c 12345 "https://mytext.abb.com/app/path/to/Roaming Apple.txt"
Mittwoch, 25. März 2015 16:05
> An: users@subversion.apache.org
> Betreff: SVN Merge silently fails when parent directory is unreadable
> [..]
> I have the problem that I cannot execute any merge operation since the
> repository owner restricted access rights of some parent folders.
> [..]
st output). But there is a diff it should apply.
Entering the same revision to diff shows a valid patch.
D:\source>svn merge -c -192211 --ignore-ancestry -v .
--- Merging
D:\source>echo %ERRORLEVEL%
0
D:\source>svn st
D:\source >svn diff -c -192211
On Fri, Aug 29, 2014 at 03:40:38PM -0700, Dan Ellis wrote:
> On Fri, Aug 29, 2014 at 2:14 AM, Stefan Sperling wrote:
>
> > On Thu, Aug 28, 2014 at 02:55:57PM -0700, Dan Ellis wrote:
> >
> > > >
> > > > It sounds like if you'd be in less trouble if you could 'revert'
> > individual
> > > > propert
On Fri, Aug 29, 2014 at 2:14 AM, Stefan Sperling wrote:
> On Thu, Aug 28, 2014 at 02:55:57PM -0700, Dan Ellis wrote:
>
> > >
> > > It sounds like if you'd be in less trouble if you could 'revert'
> individual
> > > property changes to the working copy's BASE state independently of the
> > > textu
On Thu, Aug 28, 2014 at 02:55:57PM -0700, Dan Ellis wrote:
> >
> >
> > I don't think this is a merge problem as much as a conflict resolution
> > problem. Perhaps efforts would be a better invested in trying to improve
> > the property conflict resolution mechanisms of 'svn resolve' to make
> > you
>
>
> I don't think this is a merge problem as much as a conflict resolution
> problem. Perhaps efforts would be a better invested in trying to improve
> the property conflict resolution mechanisms of 'svn resolve' to make
> your workflow easier?
>
> It sounds like if you'd be in less trouble if yo
On Thu, Aug 28, 2014 at 2:27 PM, Stefan Sperling wrote:
> On Thu, Aug 28, 2014 at 02:03:59PM -0700, Dan Ellis wrote:
> > Hi,
> > Can anyone talk about the robustness of a diff/patch solution to merging
> on
> > text contents?
>
> It would work fine, except for t
On 28 Aug 2014, at 17:03, Dan Ellis wrote:
>
>
> We maintain some vendor-like code on some branches that we periodically
> want to merge into our development branch. The problem is that both in
> our development branch and in the vendor-like branch, we use subversion
> properties for some house ke
; We really don't want to bring in details of the development done on the
> vendor branch, just a comment within our branch saying we brought in xyz,
> rev 1.1, so we ignore ancestry as well.
>
> I see two possible solutions.
>
> The first would be to include an --ignore-p
1, so we ignore ancestry as well.
I see two possible solutions.
The first would be to include an --ignore-properties on the merge command:
svn merge -r --ignore-ancestry --ignore-properties
The second would be to do a trip through svn diff to create a patch and
then apply the patch (from svnbook
Overview of problem:
Using svn client 1.8.10 on Mac OSX 10.9.4, downloaded from wandisco.
When trying to sync trunk to a branch with the command: svn merge ^/trunk
I get the following error:
svn merge ^/trunk
svn: E195016: Reintegrate can only be used if revisions 3 through 6 were
previously
Hi,
In an attempt to make svn merge perform better I am trying to do the merge
using only local paths. Not sure if this can help but I thought it wouldn't
hurt to try. But now it seems this is not possible because of what looks like a
bug to me. In any case I can't explain it and the
ansmitting file data .
Committed revision 3.
D:\src\t>cd ..\b
D:\src\b>svn status
M test.txt
D:\src\b>svn commit -m "branch add-on"
Sendingtest.txt
Transmitting file data .
Committed revision 4.
D:\src\b>cd ..\t
D:\src\t>svn update
Updating '.'
Guten Tag Masood,
am Donnerstag, 23. Januar 2014 um 12:18 schrieben Sie:
> I want to perform Code Quality Analysis on release[...]
Write a server side pre commit hook and do such analysis on the
server, rejecting a commit on errors. The key point is that you want
to analyze the result of the merg
redirect to Code Quality Operation whenever a user
want to perform merge on SVN.
Thanks Ahead.
With Regards,
Masood
--
View this message in context:
http://subversion.1072662.n5.nabble.com/Pre-step-before-SVN-Merge-tp186698p186716.html
Sent from the Subversion Users mailing list archive at
Guten Tag Masood,
am Donnerstag, 23. Januar 2014 um 06:35 schrieben Sie:
> That hook
> script will perform the code analysis and if there there is any critical
> issue then it will abort the merge operation.
Which code analysis do you speak of and what are the critical issues
you may see? Are you
On 1/22/14, 9:49 PM, Masood wrote:
> Can I write hook scripts at server end to perform the task ?
> If so, can i get any web link for it ?
A merge is just a read operation as far as the server is concerned and we don't
have hooks for reads.
There actually is one Subversion client that supports cl
Dear Team,
Thanks for the reply.
Can I write hook scripts at server end to perform the task ?
If so, can i get any web link for it ?
Thanks Ahead,
With Regards,
Masood
--
View this message in context:
http://subversion.1072662.n5.nabble.com/Pre-step-before-SVN-Merge-tp186698p186707.html
On Wed, Jan 22, 2014, at 09:35 PM, Masood wrote:
> Actually I want to execute a hook scripts before merge operation whenever
> user
> start merge task(either from SVN merger command or from GUI). That hook
> script will perform the code analysis and if there there is any critical
> issue then it wi
operation.
Any other information to perform this task will be useful to me.
Thanks Ahead,
With Regards,
Masood
--
View this message in context:
http://subversion.1072662.n5.nabble.com/Pre-step-before-SVN-Merge-tp186698p186705.html
Sent from the Subversion Users mailing list archive at
Guten Tag Masood,
am Mittwoch, 22. Januar 2014 um 12:50 schrieben Sie:
> Does anyone have some information on it ?
You should provide some more details about your use case, especially
if you need something user orientated before one starts with a merge
in whatever client one uses or something whi
--
View this message in context:
http://subversion.1072662.n5.nabble.com/Pre-step-before-SVN-Merge-tp186698.html
Sent from the Subversion Users mailing list archive at Nabble.com.
hat's the correct syntax for svn merge --record-only ?
>
> Is it
>
> svn merge -c 1,5,8,10,11 --record-only trunk/directory
>
> or
>
> svn merge -r 1:11 --record-only trunk/directory
The correct syntax is "svn help merge".
-- Brane
--
Branko Čibej | Director of Subversion
WANdisco // Non-Stop Data
e. br...@wandisco.com
Hi All
We have a few revision numbers on trunk that we like to block but they are
not in consecutive order - i.e. rev numbers 1,5,8,10,11
We like to merge from trunk to a branch but would like to block them on the
branch.
What's the correct syntax for svn merge --record-only ?
Is it
svn
Ben,
I should have checked "svn help" before posting...thank you for the
response.
On Thu, Dec 5, 2013 at 11:32 AM, Ben Reser wrote:
> On 12/5/13 9:29 AM, C M wrote:
> > Hello.
> >
> > I ran "svn merge --reintegrate --dry-run" against branch. As part
On 12/5/13 9:29 AM, C M wrote:
> Hello.
>
> I ran "svn merge --reintegrate --dry-run" against branch. As part of the
> dry-run preview, several files are marked with:
>
> Rpath-to-file\src\Update.c
>
> What does the "R" mean? I haven't en
Hello.
I ran "svn merge --reintegrate --dry-run" against branch. As part of the
dry-run preview, several files are marked with:
Rpath-to-file\src\Update.c
What does the "R" mean? I haven't encountered it before. Can someone please
explain?
Thank you.
Hi All
Are there side effects from applying the same svn merge --record-only on
the same revision number and a new commit each time it is applied ?
Would there be issues with SVN mergeinfo and/or SVN in general if one keeps
applying
svn merge --record-only on a revision number repeatedly and
On 29/10/13 10:43, Stefan Sperling wrote:
On Tue, Oct 29, 2013 at 09:10:45AM +, Giulio Troccoli wrote:
On 29/10/13 05:38, Zk W wrote:
Hi All
We use SVN 1.6
How do we perform a svn merge "revert" of a revision number that is
--record-only in linux shell before a svn commit ?
On Tue, Oct 29, 2013 at 09:10:45AM +, Giulio Troccoli wrote:
>
> On 29/10/13 05:38, Zk W wrote:
> >Hi All
> >
> >We use SVN 1.6
> >How do we perform a svn merge "revert" of a revision number that is
> >--record-only in linux shell before a svn co
On 29.10.2013 10:10, Giulio Troccoli wrote:
>
> On 29/10/13 05:38, Zk W wrote:
>> Hi All
>>
>> We use SVN 1.6
>> How do we perform a svn merge "revert" of a revision number that is
>> --record-only in linux shell before a svn commit ?
>>
&
On 29/10/13 05:38, Zk W wrote:
Hi All
We use SVN 1.6
How do we perform a svn merge "revert" of a revision number that is
--record-only in linux shell before a svn commit ?
We perform
svn merge --record-only -c 1234 http://testsomething.com
We like to revert that step.
Thank you
Hi All
We use SVN 1.6
How do we perform a svn merge "revert" of a revision number that is
--record-only in linux shell before a svn commit ?
We perform
svn merge --record-only -c 1234 http://testsomething.com
We like to revert that step.
Thank you
Sincerely
Hi All
Would there be issues with SVN mergeinfo and/or SVN in general if one keeps
applying
svn merge --record-only on a revision number repeatedly and commit in a
svn merge --record-only followed by commit followed by svn merge
--record-only followed by commit and the next cycle begins ? It&#
1 - 100 of 254 matches
Mail list logo
