Christophe Royer wrote on Sat, 14 May 2022 23:28 +00:00:
> Thank you for looking into this, taking the time to clean up the script
> and share your comments. Lessons learnt.
>
> I will likely revert (maybe manually) those invalid mergeinfo.
>
Sure. I recommend that you use a record-only reverse
Thank you for looking into this, taking the time to clean up the script
and share your comments. Lessons learnt.
I will likely revert (maybe manually) those invalid mergeinfo.
Still not quite sure of the consequences, and if this situation could be
detected. Maybe a defect or enhancement shoul
Christophe Royer wrote on Fri, May 13, 2022 at 10:45:14 -0700:
> Daniel, the first script I sent may confuse things a little, because of the
> tree conflict.
> Here is another script that avoid that issue. The problem is the same: it
> looks like the mergeinfo does not match the state of the branch
Daniel, the first script I sent may confuse things a little, because of
the tree conflict.
Here is another script that avoid that issue. The problem is the same:
it looks like the mergeinfo does not match the state of the branch.
-start of 2nd script
@ECHO off
REM -- Script to test handling
Shahaf ; users@subversion.apache.org
Subject: [External] Re: Question about mergeinfo and 2-url merge
Thank you Daniel, below is the script I used (line wrapping might mess up a few
lines, sorry)
As I was cleaning it up, I realized that in 1.6.17 (yes, still using it, and
where I saw the
Thank you Daniel, below is the script I used (line wrapping might mess
up a few lines, sorry)
As I was cleaning it up, I realized that in 1.6.17 (yes, still using it,
and where I saw the issue first) the behavior is different (2-url merge
gives me a tree conflict).
I am really tempted to del
Could you post the script, please? It's hard to answer your question
when it describes the details verbally rather than machine-readably.
It sounds like a supported scenario.
Cheers,
Daniel
Christophe Royer wrote on Fri, 06 May 2022 21:46 +00:00:
> I recently saw some mergeinfo that I can exp
Den tors 21 okt. 2021 kl 09:31 skrev Eugeny Sosnovsky <
eugeny.sosnov...@silverfirsoftware.com>:
> To whom it may concern,
> The SVN Book version 1.8 states, that if at a given path, *svn:auto-props*
> contains two or more file patterns that can match the same file, and such a
> file is added, the
On Sat, Jan 11, 2020 at 10:20:01AM +0800, guan.j...@byd.com wrote:
> When I commit file to svn， a warning as follow， and failed to commit
> modified file
TortoiseSVN 1.8.7 is very old.
Please upgrade, and this problem should go away.
See https://tortoisesvn.net/downloads.html
Regards,
Stefan
On Mon, Apr 22, 2019 at 01:29:15PM -0400, Kathleen Warren wrote:
> Hi all,
>
> I've gotten myself into a bit of a svn merging funk and I'd like to know if
> my proposed solution will cause further errors.
>
> Due to a misunderstanding of how svn handles mergeinfo, I merged several
> commits from
The command "sudo yum install subversion"; should proved the default
subversion for your operating system. If you want a more recent one, at
last check, the company "wandisco" provides quite recent releases. If you
decide you want to build your own, which I don't recommend for the faint of
heart, t
On Thu, Jan 11, 2018 at 3:48 PM, Max Bernhardt wrote:
> Hi Johan,
>
> thanks for the reply. Sorry for the personal mail, but since I'm not
> subscribed, this is the only way I know of to respond.
>
> No our client was still version 1.7.8, so this might have caused the
> problem.
>
> The revert was
On Mon, Jan 8, 2018 at 2:24 PM, Max Bernhardt wrote:
> Hi all,
>
> We've just upgraded our subversion server from 1.4.6 to 1.9.7 and now I'm
> getting a strange merge conflict, when I'm trying to do a reverse merge on a
> baseline (trunk).
>
> The situation is as follows:
> /project/branches/i
Hi Bert,
first of all thank you for your response.
The following is exactly my case:
"If you have local changes, and then an update comes in with changes,
you have a different situation. In that case we start a merge operation,
that may or may not complete automatically depending on the combin
> -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 fol
On Aug 12, 2015, at 4:00, Branko Čibej wrote:
>
> Yay for misunderstandings. :)
>
> The problem with HFS is that it normalizes paths: regardless of how your
> file names are (de)normalised when you create them, they're stored in
> HFS in NFD form.
I don't think I misunderstood anything; I said
On 12.08.2015 00:11, Dave Huang wrote:
> On Aug 11, 2015, at 15:35, Branko Čibej wrote:
>> On 10.08.2015 18:46, Attila Soki wrote:
>>> hi,
>>>
>>> i saw the entry "reimplement UTF-8 fuzzy conversion using utf8proc
>>> (r1511676)"
>>> in the changelog and hoped this would be the fix for
>>> http:/
On Tue, Aug 11, 2015 at 7:12 PM, Stefan Sperling wrote:
> On Tue, Aug 11, 2015 at 05:11:10PM -0500, Dave Huang wrote:
>> On Aug 11, 2015, at 15:35, Branko Čibej wrote:
>> >
>> > On 10.08.2015 18:46, Attila Soki wrote:
>> >> hi,
>> >>
>> >> i saw the entry "reimplement UTF-8 fuzzy conversion using
On Tue, Aug 11, 2015 at 05:11:10PM -0500, Dave Huang wrote:
> On Aug 11, 2015, at 15:35, Branko Čibej wrote:
> >
> > On 10.08.2015 18:46, Attila Soki wrote:
> >> hi,
> >>
> >> i saw the entry "reimplement UTF-8 fuzzy conversion using utf8proc
> >> (r1511676)"
> >> in the changelog and hoped thi
On Aug 11, 2015, at 15:35, Branko Čibej wrote:
>
> On 10.08.2015 18:46, Attila Soki wrote:
>> hi,
>>
>> i saw the entry "reimplement UTF-8 fuzzy conversion using utf8proc
>> (r1511676)"
>> in the changelog and hoped this would be the fix for
>> http://subversion.tigris.org/issues/show_bug.cgi?i
On 10.08.2015 18:46, Attila Soki wrote:
> hi,
>
> i saw the entry "reimplement UTF-8 fuzzy conversion using utf8proc (r1511676)"
> in the changelog and hoped this would be the fix for
> http://subversion.tigris.org/issues/show_bug.cgi?id=2464
>
> but after a quick test it seems to be still broken.
On 8/1/2015 16:10, Daniel Shahaf wrote:
Jens Drodofsky wrote on Fri, Jul 31, 2015 at 11:36:46 +0200:
Hello,
I didn't have any problems, all is working, but in the German language
there are some letters (special characters: ä , ö, ü and ß) that are
used in the command line.
Example (Command):
Ge
Jens Drodofsky wrote on Fri, Jul 31, 2015 at 11:36:46 +0200:
> Hello,
> I didn't have any problems, all is working, but in the German language
> there are some letters (special characters: ä , ö, ü and ß) that are
> used in the command line.
>
> Example (Command):
> Geben Sie ¯svn help® f?r weiter
Hello,
On 27/03/14 20:21, Havlovick, Ron wrote:
> When you commit a file, send an email to the author, or for that matter
> anyone, that the file has been committed back into the repository
Read about post-commit hooks.
http://svnbook.red-bean.com/nightly/en/svn.reposadmin.create.html#svn.reposad
On Fri, Mar 14, 2014 at 10:12:07AM -0500, Matthew Hamilton wrote:
> I have read the Subversion book regarding the configuration of
> mod_authnz_svn and mod_dav_svn for apache as the Subversion server.
It's called 'mod_authz_svn'.
> I am making use of mod_authnz_ldap to restrict access to our repo
Below is my apache config for SVN:
httpd.conf:
# mod_dav_svn configuration
DAV svn
SVNParentPath /opt/web/subversion/repos
# mod_authn_core configuration
AuthType Basic
AuthName "Authorized Developers Only"
# mod_auth_basic
AuthBasicProvider ld
Matthew Hamilton writes:
> I would like to be able to define the groups based on ldap groups
>
> [groups]
> proj1-devs = CN=proj1_developers,ou=ldap,dc=mycorp,dc=com
> proj2-devs = CN=proj2_developers,ou=ldap,dc=mycorp,dc=com
>
> [proj1:/]
> proj1-devs = rw
> proj2-devs = r
>
> [proj2:/]
> proj1-
On Thu, Jun 27, 2013 at 7:06 AM, Nico Kadel-Garcia wrote:
>>> http://svnbook.red-bean.com/en/1.7/svn.advanced.props.special.ignore.html
>>
>> In summary: this is a way to tell svn to ignore a file (or filename pattern)
>> when looking for files to check-in. Hence the file itself is not in the
On Thu, Jun 27, 2013 at 6:50 AM, Cooke, Mark wrote:
> [Please post inline, it makes it easier to follow...]
>
>> Message original ----
>> Sujet: Re: Question about subversion
>> De : Cooke, Mark
>> Pour : Marc Davenne , Andrew Reedick
>>
>&
[Please post inline, it makes it easier to follow...]
> Message original
> Sujet: Re: Question about subversion
> De : Cooke, Mark
> Pour : Marc Davenne , Andrew Reedick
>
> Copie à : "users@subversion.apache.org"
> Date : 27/06/2013 11:4
I am not sure I understand it very well. When you say it is ignored,
does it mean it is on svn ?
And what is this script that would trigger on checkout ?
Can you explain it again ?
Message original
Sujet: Re: Question about subversion
De : Cooke, Mark
Pour : Marc Davenne
> -Original Message-
> From: Marc Davenne [mailto:marc.dave...@cramif.cnamts.fr]
> Sent: 27 June 2013 10:25
> To: Andrew Reedick
> Cc: users@subversion.apache.org
> Subject: Re: Question about subversion
>
> Thank you for your answers... all of you
>
> @A
ement.
Typically I would not put it on svn because everybody has different
ones... but how to I version the param file (without it the application
does not work)
Message original
Sujet: Re: Question about subversion
De : Andrew Reedick
Pour : Marc Davenne ,
2013/6/26 Marc Davenne :
> Hi there. I have a question about subversion.
>
> I have a theory on what files should not be on SVN and I would like you to
> tell me if you agree. If you dont agree can you tell me why please. If you
> see more files that should not be there, tell me and why.
>
> Files
> From: Marc Davenne [mailto:marc.dave...@cramif.cnamts.fr]
> Sent: Wednesday, June 26, 2013 10:37 AM
> To: users@subversion.apache.org
> Subject: Question about subversion
>
> Hi there. I have a question about subversion.
>
>
> I have a theory on what files should not be on SVN and I would like
> Hi there. I have a question about subversion.
I think the previous response was quite correct, it mostly all depends.
> I have a theory on what files should not be on SVN and I would like you to
> tell
> me if you agree. If you dont agree can you tell me why please. If you see more
> files th
Guten Tag Marc Davenne,
am Mittwoch, 26. Juni 2013 um 16:36 schrieben Sie:
> Files who should not be on SVN :
>
> files automatically generated
This depends on the files which get automatically generated and their
purpose: It's perfectly valid to version automatically generated
> Just 7 Gigabytes? Our repository is 13 Gigabytes and I don't even think
we have that big a project.
Just FYI one of my repositories is now 130 Gigabytes big and is running
just fine :) It has almost 94.5 thousand commits in it.
Guten Tag C M,
am Mittwoch, 24. April 2013 um 23:47 schrieben Sie:
> Any advice/gotchas are most appreciated.
You shouldn't capture other's threads. ;-)
Besides that, your three question seem to be all the same to me: If
you delete svn:externals on the trunk, they aren't available anymore
on the
On Mon, Apr 22, 2013 at 3:30 PM, Ahmed, Omair (GE Oil & Gas) <
omair.ah...@ge.com> wrote:
> Hello,
>
> Is "Needs-Lock" the correct (or expected) mechanism by which to make a
> release tag immutable? Basically, I am looking for a way to "lock" a tag to
> prevent accidental updates.
>
> No. svn:need
Guten Tag Wolfgang Stengel,
am Mittwoch, 13. März 2013 um 08:51 schrieben Sie:
> The version is 3.6.3, however I think all these requests
> originate from the Subversion client itself... is it known why
> these two files are checked repeatedly although they do not
> exist (at this tim
Hi Andy,
Am 12.03.2013 18:44, schrieb Andy Levy:
On Tue, Mar 12, 2013 at 7:55 AM, Wolfgang Stengel
mailto:wolfgang.sten...@efactory.de>>
wrote:
Hello list,
since a couple of weeks commits from a Windows system in a Samba
shared WC take much longer than before (using Windows 7,
On Tue, Mar 12, 2013 at 7:55 AM, Wolfgang Stengel <
wolfgang.sten...@efactory.de> wrote:
> Hello list,
>
> since a couple of weeks commits from a Windows system in a Samba shared WC
> take much longer than before (using Windows 7, Subversion client 1.7.8).
>
> I tracked this down to Subversion ac
But that means I have to create a working copy. I don't necessarily want to
do that if all I am looking for is a directory listing.
On Wed, Feb 20, 2013 at 11:06 AM, Geoff Hoffman
wrote:
>
>
> On Wed, Feb 20, 2013 at 10:02 AM, C M wrote:
>
>> The "svn list" command does not list directory entrie
C M writes:
> The "svn list" command does not list directory entries if they are
> svn:externals.
>
> Assuming this is by design, is there a way for it list externals also?
The Subversion 1.8, the next release, currently has
$ svn ls http://localhost/repo --include-externals
A/
Listing externa
On Wed, Feb 20, 2013 at 10:02 AM, C M wrote:
> The "svn list" command does not list directory entries if they are
> svn:externals.
>
> Assuming this is by design, is there a way for it list externals also?
>
cd into the local directory defined by your external, then svn list there.
--
Conne
On 01/08/2013 12:11 PM, Leonard Wayne wrote:
Hello.
I read the Subversion documentation (in
particular the "Peg and Operative Revisions"
section) for how to handle versioning of
directories with names that contain the "@"
symbol. But I am still confused by something.
I want to use the "import"
On Sat, Sep 29, 2012 at 12:23 PM, Ryan Schmidt <
subversion-20...@ryandesign.com> wrote:
Right, and important to understand: you didn't even need to have a working
> copy to do that. Because you used URLs to the repository, the copy happened
> directly in the repository.
Thanks Ryan, I have re
On Sat, Sep 29, 2012 at 12:22 PM, Thorsten Schöning
wrote:
Thanks Thorsten for your reply.
> Where did you right click to show the log, in the WC, before or after
> running update or in the repo browser? What are the settings about
> ignoring paths etc. in the log dialog?
>
Right clicked using
On Sep 28, 2012, at 23:10, Ravi Roy wrote:
> /trunk has these three folders. What I did was created a WC of /trunk and run
> the following command to move "folderA" into "folderC" :
>
> svn move http://myserver.mydomain.com/svn/MyRepo/folderA
> http://myserver.mydomain.com/svn/MyRepo/folde
Guten Tag Ravi Roy,
am Samstag, 29. September 2012 um 06:10 schrieben Sie:
> and command run successfully and new revision committed in the repository.
> I checked in the repository and folder it moved, but when I right click and
> show log of that folder it says folder does not exist but Tortoise
sday, September 06, 2012 2:39 PM
To: Anastasio, David M CTR USAF AFMC AFLCMC/HNID
Cc: users@subversion.apache.org
Subject: Re: Question about Basic Authentication
On 9/6/2012 11:08 AM, Anastasio, David M CTR USAF AFMC AFLCMC/HNID wrote:
> Yes, I think that is exactly the problem here.
> I will try
Guten Tag John Maher,
am Donnerstag, 6. September 2012 um 21:52 schrieben Sie:
> Very tedious, unless, of course, there is a better way.
You really should start a new thread and maybe ask a question.
Mit freundlichen Grüßen,
Thorsten Schöning
--
Thorsten Schöning E-Mail:thorsten.schoen.
Hello
I am trying to create a repository without a lot of junk that exists
with the source. Namely 2 files and two folders. The import command
doesn't seem to allow exclusion, at least not in the book. These
exclusions also need to be applied to all users so a directory property
is required. B
On 9/6/2012 11:08 AM, Anastasio, David M CTR USAF AFMC AFLCMC/HNID wrote:
Yes, I think that is exactly the problem here.
I will try to create the password file with htpasswd.
Does Apache suggest where the password file should reside?
Is it restricted to a certain location? I couldn't find this in
From: MARTIN PHILIP [mailto:codematt...@ntlworld.com] On Behalf Of Philip
Martin
Sent: Thursday, September 06, 2012 2:02 PM
To: Anastasio, David M CTR USAF AFMC AFLCMC/HNID
Cc: users@subversion.apache.org
Subject: Re: Question about Basic Authentication
"Anastasio, David M CTR USAF AFMC AFLCMC/HNI
"Anastasio, David M CTR USAF AFMC AFLCMC/HNID"
writes:
> The mod_authz_user shared object was already enabled in my configuration.
> Still looking for an answer.
>> SVNParentPath c:/svnrepos
>> AuthType Basic
>> AuthName "Subversion repositories"
>> AuthUserFile C:/svnrepos/test1/conf/passwd
It
@subversion.apache.org
Subject: RE: Question about Basic Authentication
[Note: please post in plain text if at all possible!]
> -Original Message-
> From: Anastasio, David M CTR USAF AFMC AFLCMC/HNID
> [mailto:david.anastasio@hanscom.af.mil]
> Sent: 06 September 2012 16:26
[Note: please post in plain text if at all possible!]
> -Original Message-
> From: Anastasio, David M CTR USAF AFMC AFLCMC/HNID
> [mailto:david.anastasio@hanscom.af.mil]
> Sent: 06 September 2012 16:26
> To: users@subversion.apache.org
> Subject: Question about Basic Authentication
>
Thank you very much,
David
-Original Message-
From: Thorsten Schöning [mailto:tschoen...@am-soft.de]
Sent: Wednesday, August 29, 2012 4:04 PM
To: users@subversion.apache.org
Subject: Re: Question about web access to SVN repository
Guten Tag Anastasio, David M CTR USAF AFMC AFLCMC
Anastasio, David M CTR USAF AFMC AFLCMC/HNID wrote:
>My current configuration is Subversion 1.7.6 with Apache server 2.2.22 and
>TortoiseSVN client (not sure which version at the moment), running on
>Windows 2003 Server.
>
>On the local machine, I can access the SVN repository through the file:///
Guten Tag Anastasio, David M CTR USAF AFMC AFLCMC/HNID,
am Mittwoch, 29. August 2012 um 21:40 schrieben Sie:
> It seems the solution here is for the web server to exec the TortoiseSVN
> client software as part of retrieving the SVN repository contents.
This is not (easily) possible, as Tortoise's
On Thu, Mar 15, 2012 at 8:05 AM, Mark-E wrote:
>
> The section is setup like this in SVN:
>
> Archive/project1/trunk
> Archive/project2/trunk
> Archive/project3/trunk
>
> What I would like to be able to do is use svn co to check out the trunk
> folder for each project without specifically issuing
On Thu, Mar 15, 2012 at 05:40:23PM +0400, Konstantin Kolinko wrote:
> 1) do "svn co --depth immediates" for the repository root
> 2) and follow it by "svn up --set-depth" for the subfolders that you
> are interested in.
You can also use --depth empty in the first command to avoid having
all immedi
>That is not possible. But you may look into the "sparse checkout" feature.
>
>To set it up you can
>1) do "svn co --depth immediates" for the repository root
>2) and follow it by "svn up --set-depth" for the subfolders that you
>are interested in.
>
>If you are on Unixes then you can use wildcard
2012/3/15 Mark-E :
>
> I am using OpenGrok as a search engine for SVN.
>
> I have an Archived section of obsolete code that users still want to be able
> to search.
> It is currently not searchable in our grok installation.
>
> The section is setup like this in SVN:
>
> Archive/project1/trunk
> Arc
o.de]
Sent: Tuesday, 28 February 2012 7:53 PM
To: GENG, DAPENG (DAPENG)
Cc: users@subversion.apache.org
Subject: Re: Question: merge info is no updated after merge
On Feb 28, 2012, at 8:56 , Stephen Butler wrote:
>
> On Feb 28, 2012, at 7:24 , GENG, DAPENG (DAPENG) wrote:
>
>> H
On Feb 28, 2012, at 8:56 , Stephen Butler wrote:
>
> On Feb 28, 2012, at 7:24 , GENG, DAPENG (DAPENG) wrote:
>
>> Hello,
>>
>> I recently discovered that merge info does not get updated after merge.
>>
>> I’ve tried several times from one branch to taget branch. And merge info
>> remains unc
On Feb 28, 2012, at 7:24 , GENG, DAPENG (DAPENG) wrote:
> Hello,
>
> I recently discovered that merge info does not get updated after merge.
>
> I’ve tried several times from one branch to taget branch. And merge info
> remains unchanged.
>
> In target branch, there are existing merge info
On Mon, Feb 13, 2012 at 17:22, Anastasio, David M CTR USAF AFMC
ESC/HNID wrote:
> Hello,
>
>
>
> I am trying to integrate Apache Subversion for source code control of my
> development group’s changes to our vendor’s code base.
>
> The vendor indicates that integration to the application’s code bas
No!
De: Anastasio, David M CTR USAF AFMC ESC/HNID
[mailto:david.anastasio@hanscom.af.mil]
Enviado: Monday, February 13, 2012 05:52 PM
Para: users@subversion.apache.org
Asunto: Question about Apache Subversion API compatibility
Hello,
I am trying to integrate Apache Subversion for source co
I guess it's time for my ~yearly question about why SVN can never seem
to do this merge properly... Summary: I have a "releaseA" branch off of
trunk, then a "releaseA + custom stuff" branch off of "releaseA". I also
have a "releaseB" branch off of trunk. I want to merge "custom stuff"
into "rel
And yes I know it does matter what way you invoke the tool, I was trying to
figure out what was going on with the original problem by putting together
a quick scenario (OK a slightly wobbly one).
But I had to jump to conclusions to guess what was occurring
in the original question. How else can you
Oh and Stefan
"Again, please verify that you're invoking the tool in the right way
before jumping to conclusions."
Jumping to conclusions is the only way I get exercise :) :)
On 9 December 2011 16:52, Rob Pointer wrote:
> Stefan
> That's exactly what I was saying, that if any merging/copy has
Stefan
That's exactly what I was saying, that if any merging/copy has occurred
from trunk to branch, then you need to use the reintegrate merge. if you
don't then that's when you get merge conflicts.
On 9 December 2011 14:00, Stefan Sperling wrote:
> On Fri, Dec 09, 2011 at 01:05:02PM +, Ro
> On 8 December 2011 18:10, Stefan Sperling wrote:
> On Thu, Dec 08, 2011 at 10:15:24AM -0700, Randall Reynolds wrote:
> > When I select merge a range of revisions and leave the range blank, it says:
> >
> > Merging r7 through 42194
> > <~10 tree conflicts on main folders>
> >
> > Does this mean w
On Fri, Dec 09, 2011 at 07:06:10AM -0700, Randall Reynolds wrote:
> Little tangent here, but FWIW I found that the version on the server
> supported merge tracking so it was super wierd that the whole codebase
> reported tree conflicts. I think we merged incorrectly a long time ago and
> this migh
Little tangent here, but FWIW I found that the version on the server
supported merge tracking so it was super wierd that the whole codebase
reported tree conflicts. I think we merged incorrectly a long time ago and
this might have caused the conflicts. I just rebranched, problem solved,
next step
On Fri, Dec 09, 2011 at 01:05:02PM +, Rob Pointer wrote:
> Mark
> If you put changes multiple times from trunk to a branch (in development
> terms, a re-base) you can cause reflective merges and actually cause more
> problems. The recommended merge back into trunk is a reintegrate merge.
> I a
Let me explain my reasoning.
My thinking is that if you are trying to merge from trunk to branch, then
you are doing things the wrong way around, because if you copy out from
trunk, you merge back into trunk.
The other issue may be that If you copy from trunk more than once to the
same branch (fr
b Pointer [mailto:rpoin...@clearvision-cm.com]
> > Sent: 09 December 2011 12:45
> > To: Randall Reynolds; Cooke, Mark; users@subversion.apache.org
> > Subject: Re: Question
> >
> > I have been looking through this thread and it might be resolved.
> >
> > Can I ask
I have been looking through this thread and it might be resolved.
Can I ask why you are trying to merge from trunk into the branch? The
usual operation would be the other way around, otherwise you can run into
reflective merge issues.
Rob
On 8 December 2011 18:10, Stefan Sperling wrote:
> On
> -Original Message-
> From: Rob Pointer [mailto:rpoin...@clearvision-cm.com]
> Sent: 09 December 2011 12:45
> To: Randall Reynolds; Cooke, Mark; users@subversion.apache.org
> Subject: Re: Question
>
> I have been looking through this thread and it might be reso
On Thu, Dec 08, 2011 at 10:15:24AM -0700, Randall Reynolds wrote:
> When I select merge a range of revisions and leave the range blank, it says:
>
> Merging r7 through 42194
> <~10 tree conflicts on main folders>
>
> Does this mean we have never merged the trunk into the branch correctly in
> a w
yntax types listed in
>>> > > that text matches the order in which tortoisesvn presents
>>> > > its merge options.
>>> > >
>>> > > > What should I do to make the branch match the trunk,
>>> > > > in this case? How can
gt; >
>> > > To merge from the trunk to the branch try using the
>> > > first ("Merge a range of revisions") of the 3
>> > > options which tortoisesvn presents. That should do
>> > > the right thing.
>> > >
>> > > To
ng up in the future for this file?
> > >
> > > To merge from the trunk to the branch try using the
> > > first ("Merge a range of revisions") of the 3
> > > options which tortoisesvn presents. That should do
> > > the right thing.
> >
o
> > the right thing.
> >
> > To merge the other way (branch back into trunk), use
> > the 'reintegrate' option.
> >
> > The 'merge 2 branches' option is only necessary for more
> > complex cases.
>
>
> -Original Message
Stefan,
I did not understand the three merge options and clearly chose the wrong
option. After reading your response and reading about the merge options, I
now understand this. Thank you.
I changed my workflow to use the first option and merged the range
<#>-HEAD, where <#> is the last trunk re
On Wed, Dec 07, 2011 at 04:23:09PM -0700, Randall Reynolds wrote:
> Hi,
>
> I created a trunk and branch A from the trunk. Then, I created a file in
> the trunk. Then, I merged from the trunk to the branch using TortoiseSVN's
> merge two branches option. The merge encountered a tree conflict on
> Hi,
>
> I created a trunk and branch A from the trunk. Then, I created a file in
> the trunk. Then, I merged from the trunk to the branch using TortoiseSVN's
> merge two branches option. The merge encountered a tree conflict on the
> file. Selecting edit tree conflict says:
> The last mer
On Tue, Jul 26, 2011 at 05:08:52PM +0200, Thomas Clement wrote:
> Hello list,
>
> I have a repository which contains an external to another repository with a
> fixed revision number.
> Something like: "-rxxx svn+ssh://..."
>
> I noticed I can make modifications inside this external and commit th
On Tue, Jul 26, 2011 at 8:08 AM, Thomas Clement wrote:
> Hello list,
>
> I have a repository which contains an external to another repository with a
> fixed revision number.
> Something like: "-rxxx svn+ssh://..."
>
> I noticed I can make modifications inside this external and commit the
> modific
On Jun 23, 2011, at 20:01, Jean-Yves Avenard wrote:
> On 24 June 2011 05:33, Ryan Schmidt wrote:
>> You should be able to meet the "same revision numbers across both
>> repositories" goal by inserting empty revisions for the ones not applicable
>> to the projects in each new repo (the tools shoul
On 24 June 2011 05:33, Ryan Schmidt wrote:
> You should be able to meet the "same revision numbers across both
> repositories" goal by inserting empty revisions for the ones not applicable
> to the projects in each new repo (the tools should do this for you when you
> use the right arguments).
On Jun 23, 2011, at 02:58, Jean-Yves Avenard wrote:
> Should mention that I would like the revision number and history to
> remain the same across both repo; so people can easily move their
> existing checkout using svn switch.
You should be able to meet the "same revision numbers across both re
> I have a customer that is interested in purchasing and utilizing
> Subversion. I want to be sure that we architect the
> server/repository on the correct solution and couldn’t find much
> information on the recommended implementation path and architecture
> setups. If anyone is able to provide
Hi,
Thanks very much for your answer. I get it.
.jovi
-Original Message-
From: ext Ryan Schmidt [mailto:subversion-20...@ryandesign.com]
Sent: Monday, December 20, 2010 10:02 PM
To: Zhang, Wei-Jovi (NSN - CN/Hangzhou)
Cc: Subversion Users
Subject: Re: [Question] Svn log show
Ryan Schmidt wrote on Mon, Dec 20, 2010 at 08:01:40 -0600:
> I'm removing dev@ from the Cc, since this is a question about how to use
> Subversion, and not a discussion about its development.
>
+1
>
> On Dec 19, 2010, at 21:17, Zhang, Wei-Jovi (NSN - CN/Hangzhou) wrote:
>
> > I have a
I'm removing dev@ from the Cc, since this is a question about how to use
Subversion, and not a discussion about its development.
On Dec 19, 2010, at 21:17, Zhang, Wei-Jovi (NSN - CN/Hangzhou) wrote:
> I have a question about svn log command, every time when I use svn
> log command, I'm
1 - 100 of 189 matches
Mail list logo
