uced errors and strange conflicts. With
Subversion 1.8 or higher, I am forced to cherry-pick, which may sometimes
produce poor results if I pick the
wrong cherries. I had regarded cherry-picking as error-prone and something to
be avoided, but it's good to know that it's used suc
I'm going to try to keep this simple. Wish me luck.
Subversion requires you to do a sync merge from your trunk to a branch, before
you can do a reintegrate merge from the branch back to the trunk. But the sync
merge seems incompatible with a
branching pattern where the trunk contains ongoing dev
Why not go with a cloud based hosting provider? There are quite a few
professional ones out there. I expect it would cost less to pay one of these
providers than a single person dedicated to supporting you.
http://www.svnhostingcomparison.com/
From: Matthias Kehder [mailto:mkeh...@modernanalyt
We used this:
http://www.polarion.com/products/svn/svn_importer.php
it worked very well.
From: G Suresh [mailto:sures...@hcl.com]
Sent: Tuesday, March 03, 2015 7:36 AM
To: users@subversion.apache.org
Subject: RE: PVCS to SUBVERSION
Hi,
We want to migrate Pvcs to Subversion.
Could you please
I suggest you do a new, clean checkout. You can just copy the dirty files into
the new working copy.
From: Julio Andre Biason [mailto:jabia...@ucs.br]
Sent: Tuesday, October 21, 2014 12:11 PM
To: users@subversion.apache.org
Subject: "svn upgrade" does nothing
Hello,
I'm having a weird issue wit
You know, the files aren't really stored as files per say. Also, if using
correct ACLs in your repository there is no way any of these files can be
"executed".
I assume by "scan" you are talking about virus scanning. I would question the
need to do this. Yea, I know... but still, many request
> On Wed, Aug 27, 2014 at 12:58 PM, Bob Archer
> wrote:
> >> -Original Message-
> >> And I hate to repeat myself, but I'll repeat for the third time this
> >> question: if file:// is not intended to be used, then what are the
> >> availab
> -Original Message-
> And I hate to repeat myself, but I'll repeat for the third time this
> question: if file:// is not intended to be used, then what are the available
> options for those who need a version control system and can't set up a
> server?
>
> Zé
Does the file server support
> Hi, I created a repo using svnadmin create in a dir called trunk (that's what
> your supposed to do, right?) The operation succeeded but the files that I
> want to version (c source which I should have versioned long ago.) I can't
> seem to add to the repo. When the code is ready for alpha releas
> Does subversion provide a way for the user to configure his username, thus
> avoiding having to pass the --username flag everytime he has to commit
> something?
>
>
> Thanks
> Zé
The credentials should be cached. If they are not being cached check in
~/.subversion/config, you probably have st
> I posted this already on the TortoiseSVN mailing list and it was suggested to
> report it to the Subversion Users mailing list:
>
> We are using TortoiseSVN (1.8.x) and the subversion command-line client
> (1.8.8) on Windows7 clients together with a VisualSVN (2.5.x) Server inside
> our company
> On 04/04/14 18:13, Bob Archer wrote:
> > [TVSN + AnkhSVN on Win7]
> > Error: sqlite[S5]: database is locked
> >
> > Error: Another process is blocking the working copy database, or the
> > underlying filesystem does not support file locking; if the working
&g
We are all running the latest TortoiseSVN which is build with svn 1.8.8.
Attempting to add files, I got this message (retrying it, the add worked)
Command: Add
Error: sqlite[S5]: database is locked
Error: Additional errors:
Error: sqlite[S5]: database is locked
Error: Another process is blocking
> Hi
>
> I am working on a branch and I want to feed some (but not all) of my changes
> back into the trunk and then to continue work on the branch.
>
> Please will someone advise me of the correct way to handle this situation?
>
> Best regards
>
> David
Generally the smallest unit you can mer
> It appears that files checked out using Subversion (1.7 onwards) are marked
> as not indexable by Windows search. The way in which this happens appears
> to be as follows:
>
> When the WC is created:
>
> 1. .svn directory is created, and marked as hidden and not indexable.
> 2. .svn/tmp directo
Ah, that's what I get for responding before reading the whole thread. Glad you
figured it out.
> -Original Message-
> From: Kevin Ross [mailto:ke...@familyross.net]
> Sent: Monday, February 24, 2014 5:48 PM
> To: Bob Archer; users@subversion.apache.org
> Subject:
Are you branching from a point prior to moving your project into the trunk
directory?
> -Original Message-
> From: Kevin Ross [mailto:ke...@familyross.net]
> Sent: Monday, February 24, 2014 4:47 PM
> To: users@subversion.apache.org
> Subject: Created branches, tags, and trunk after the fa
out specifying a range?
Hmm... I just tried it and didn't get that error:
svn mergeinfo -r6000:HEAD --show-revs eligible
http://myserver/svn/manage/MyAppRootName/v7.5.4
r60148
r60155
r60156
r60157
r60158
I'm using 1.8.4.
BOb
need to all be rooted at the same location and you use the -d switch to
specify that root location.
> -Original Message-
> From: Tom Malia [mailto:tomma...@ttdsinc.com]
> Sent: Friday, February 07, 2014 4:18 PM
> To: Bob Archer; users@subversion.apache.org
> Subject: RE:
> I've been using Apache to proide HTTP access to several different SVN
> repository directories on a single server for about 10 years.
> I'm moving everything to a new server and I was considering using SVNSERVE
> in place of or in addition to Apache for access to the repositories.
Sure... but I
> I'm trying to upgrade a very old svn repo but the command is failing.
>
> % svn upgrade .
> svn: /build/buildd/subversion-
> 1.7.5/subversion/libsvn_subr/dirent_uri.c:1518: uri_skip_ancestor: Assertion
> `svn_uri_is_canonical(parent_uri, ((void *)0))' failed.
> [1] 3298 abort svn upgrade
Are you streaming to disk, then loading from disk? You might want to just
directly pump the dump stream into the load. Just an idea.
From: Ian Wiles [mailto:ian.alexander.wi...@googlemail.com]
Sent: Friday, February 07, 2014 3:04 AM
To: subversion_us...@googlegroups.com
Cc: Ian Wiles; users@subve
ties are automatically inherited. Tortoise SVN shows those as
gray so you know they were inherited. That said, the 1.8 client only acts on
specific properties that were inherited. svn:global-ignores and svn:auto-props.
I think there was some talk on the TSVN list to have a check box to "show
inherited". But, not sure if that will happen.
>
> Thanks for your help. I think it's under control now.
BOb
eb based management tool. Users can log into the web portal
and change their passwords.
I'm not sure if there is a way to force password changes... for that I suggest
using windows domain accounts or some NTLM server.
BOb
hes with compiler
directives (most languages have them) with branching logic. For example in C#
you could do:
#if APPA
// changes or branching or whatever that is needed for app A
#endif
Then, your build scripts can define APPA or APPB.
This is pretty common way to include or exclude debug code... but doing it for
different apps or distributions of apps is another common use.
BOb
sn't affect stuff that is in the repository already.
So, I don't think that is your problem. Also, the property affects when stuff
is added.
When you did the move, did you commit both the ADD and the DELETE? You can
verify by looking at the commit info.
Does OpenGrock perhaps automatically include a "--stop-on-copy" for the log
command?
BOb
> On 11.12.2013 20:19, Bob Archer wrote:
> >> On 11.12.2013 17:21, Mark Kneisler wrote:
> >>> I think making the pristine files optional would work for me.
> >>>
> >>>
> >>>
> >>> Here’s an idea.
> >>>
> >&g
is modified? Also, it would mean
you would need a constant connection to the server to use a subversion working
copy.
BOb
> Yes, I understand the export function. I want functionality for release
> management into test and production environments.
>
> For these environments I have a few requirements:
> Files in these environments will NEVER be edited
> For new releases I will need to perform an update to
ption. Why is
> `-c`
> always giving me a range?
>
> Many thanks,
>
> ~ mark c
If you are on windows you can use SubWCRev which is distributed with
tortoiseSVN. It is designed to do what you want.
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-subwcrev.html
BOb
small groups. This way, they take care of the
hard ware sizing and stuff. However, you would probably want to dump every now
and then and store the dump file in a few places just in case.
BOb
t something to the wrong path.
Also, svn switch doesn't handle non-versioned stuff as well as say GIT does.
I'd much rather see our devs check out trunk and branch to separate local
working copies.
BOb
cause much
less conflict and problems.
BOb
From: vanderwalt.dev...@columbus.co.za [mailto:vanderwalt.dev...@columbus.co.za]
Sent: Monday, November 18, 2013 8:09 AM
To: Nico Kadel-Garcia
Cc: Subversion
Subject: Re: Looking into using Subversion
Thank for your response Nico. We what to debug from
Did you try this tool. It is what I used to migrate from PVCS.
http://www.polarion.com/products/svn/svn_importer.php
BOb
From: Olivier Antoine [mailto:oliviera201...@gmail.com]
Sent: Friday, November 15, 2013 5:47 PM
To: users@subversion.apache.org
Subject: Migrating ClearCase data to
talling older versions of subversion until
> one works with an unknown repository format.
>
>
> Regards,
> Bradley Giesbrecht (pixilla)
I'm pretty sure this message is talking about the WORKING COPY version, not the
repository version. Format 29 is probably the working copy format for 1.7.x.
BOb
Are you sure you are specifying a REPOSITORY and not a working copy???
BOb
From: David Goldsmith [mailto:eulergaussriem...@gmail.com]
Sent: Thursday, October 31, 2013 4:17 PM
To: Bob Archer
Cc: users@subversion.apache.org
Subject: Re: Windows file:/// URL format for svnsync
OK, now we're
t of time.
If you are disconnected during the process, you may see the error message
"svnsync: Couldn't get lock on destination repos after 10 attempts". If this
happens, you can remove the lock yourself; see the "Locks" section of
svnsync.txt<http://svn.collab.net/repo
Good point… our just use svnrdump to dump the repo… then you can take that
file, load it into a repo on another machine and then sync that to google.
From: Bert Huijben [mailto:b...@qqmail.nl]
Sent: Wednesday, October 30, 2013 7:02 PM
To: 'David Goldsmith'
Cc: users@subversion.apache.org
Subject:
tory be your source, so your command line should be:
svnsync init http://repoURL/trunk/repoName file:///repository --sync-username
AAA --sync-password PWD
...since you are using file:/// protocol for your source.
Also, did you heed this in the help?
The destination URL must point to the root of a repository which has been
configured to allow revision property changes.
BOb
simply a file access issue. This really has nothing to do
with subversion.
If you have access to run the exe and write access to the target directory then
you should be good. However, I think you need to specify the dump file name...
svnadmin dump path_to_repo > e:\backup\reponame.dump
Not sure if that is the issue.
BOb
info a global or local property ? it seems that whenever a new
> checkout is done, mergeinfo list matches up with other working copies of the
> same branch.
I'm not sure what you are asking here. Merge info is a subversion property, so
of course it will exist whenever you check out. Just like and svn:mime-type
property.
BOb
>
>
> Any help is appreciated.
> Sincerely
svn log' very often. :-)
> > There is no specific schedule for patch releases. Usually they come
> > not less often than every month and if important fixes are waiting for
> > release. Subversion 1.8.3 was released 29 August 2013.
> >
> Hello again Ivan,
>
> Now
> On Mon, Oct 14, 2013 at 9:26 PM, Bob Archer
> wrote:
> >> On Mon, Oct 14, 2013 at 9:08 PM, Bob Archer
> >> wrote:
> >> > Bert,
> >> >
> >> >
> >> >
> >> > But, this isn't a merge it is an update. If I reve
> On Mon, Oct 14, 2013 at 9:08 PM, Bob Archer
> wrote:
> > Bert,
> >
> >
> >
> > But, this isn't a merge it is an update. If I revert the add I lose
> > all the changes I made in step 1 of my steps below. I might have made
> > a few hundred
I made are NOWHERE in this case
and can't be recovered if my local copy of the file is deleted.
BOb
From: Bert Huijben [mailto:b...@qqmail.nl]
Sent: Monday, October 14, 2013 3:03 PM
To: Bob Archer; users@subversion.apache.org
Subject: RE: Reverting an ADD status file after an update tree c
arked as add from an update or from just adding it.
---
I reported this on the TSVN list and got a response of that how svn does it.
Doesn't this go against the do no harm mantra?
BOb
> On 11.10.2013 17:19, Bob Archer wrote:
> >> On 11.10.2013 16:55, Bob Archer wrote:
> >>>> On 11.10.2013 15:58, Bob Archer wrote:
> >>>>>> On Thu, Oct 10, 2013 at 5:49 PM, Bob Archer
>
> >>>> wrote:
> >>>>>>
> On 11.10.2013 16:55, Bob Archer wrote:
> >> On 11.10.2013 15:58, Bob Archer wrote:
> >>>> On Thu, Oct 10, 2013 at 5:49 PM, Bob Archer
> >> wrote:
> >>>> I assume he was asking how to "fix" the blame. Cause, sure, he
> &
> On 11.10.2013 15:58, Bob Archer wrote:
> >> On Thu, Oct 10, 2013 at 5:49 PM, Bob Archer
> wrote:
> >> I assume he was asking how to "fix" the blame. Cause, sure, he could
> >> open the file, convert it back to UTF-8 with CRLF line endings... and
>
> On Thu, Oct 10, 2013 at 5:49 PM, Bob Archer wrote:
> I assume he was asking how to "fix" the blame. Cause, sure, he could open
> the file, convert it back to UTF-8 with CRLF line endings... and commit it...
> of
> course, now blame is going to show him on every li
, at this point blame is probably wrong anyway, because it is showing
every line has been changed by whomever changed all the line endings.
Bottom line, I think he stuck with it.
BOb
nverted the file from UTF-8 to UTF-16.
>
>
> > Another strange thing is it's marking these as lines 20,032 and 20,058.
> > But in
> Notepad++ they are lines 10,026 and 10,031. The line numbers in pre-rev#
> 3341 diffs match up between the Notepad++ and command line fine.
>
> Sounds like the line endings changed as well.
>
Sigh... if only svn would support Unicode encodings.
BOb
s.
If you keep seeing the same conflict, it sounds like you aren't committing the
merge-info that is set on the project root. (you should always merge from the
project root).
BOb
> Am 10.09.2013 19:45, schrieb Thomas Harold:
>
> > When we moved from a monolithic repository to per-client repositories
> > a few years ago, we went ahead and:
> >
> > - Rebased the paths up one or two levels (old system was something
> > like "monolithicrepo/[a-z]/[client directories]/[job dire
> On Mon, Sep 30, 2013 at 3:14 PM, Andrew Reedick
> wrote:
> >
> > Post commit script that deletes branch A and then recreates branch A from
> trunk, i.e. make branch A effectively a tag. Since the delete and copy are
> server
> side commands, no workspace is needed to make it work. However thi
libs) which are different in the two branches.
> And we do have to run tests against both branches to make sure it works with
> the different dependencies.
> Does that make sense?
Then this should not be automated. There is always the possibility of a
conflict during the merge, and a
ped under. In this model you would also use what
are called "feature" branches. This is generally for a feature/use case that
will take more than a day to complete or will be worked on by more than one
developer.
Once again, it's up to the people not the tool to ensure your release
management is done properly.
BOb
> On Mon, Sep 23, 2013 at 1:50 PM, Bob Archer wrote:
> >> It really depends. I think all work for a specific release should be done
> >> in a
> single branch/folder. Many people follow the stable trunk model. In this model
> you generally do all work on trunk and then
to find a one-step solution rather than a two step.
>
> How about polling on the client? Issueing a svn update every some seconds
> shouldn't hurt client and server much.
>
This is what CI servers do... Cruise Control, Team City, Jenkins, etc.
BOb
in the svn group
> can read everything. (This is one of the reasons they want to break up the
> single repo into per-project repos.)
You should knock the reason off the list. You can set up path based
authorization fairly easily. (especially compared to braking it up into
multiple repos.)
BOb
ious caves with so many confusing solutions.
>
> In my head, I think I should simply be able to do:
> $svn --force update
>
> or something simple like that.
>
> How do I do this?
Try
svn cleanup
Then check your status.
Bob
quest to have a 'svn switch' option to take
> global-ignores into consideration when deciding whether to keep or delete
> local files?
>
I thought svn's policy was "do no harm"... so un-versioned files are never
deleted by default.
BOb
> Thanks Bob, that may be exactly what I am looking for. Something that would
> affect all the files without having to issue over 200 commands or build a
> dummy directory just for importing. Although that second suggestion provided
> by Andrew is definitely better than the f
don't want check in? Or are you talking about import?
I believe import respects global ignores if you have them set up in your config
file.
BOb
>
> JM
>
> -Original Message-
> From: Edwin Castro [mailto:0ptikgh...@gmx.us]
> Sent: Monday, August 12, 2013 11:55
phaned locks perhaps?
>
> They were working copy locks from another developer. I asked him to try the
> build himself to see if it allows the user who holds the lock to svn copy,
> haven't
> heard back from that.
>
> Breaking the locks allowed me to do an SVN copy.
>
> I haven't tried reproducing, but I certainly can if that would be helpful.
Are you sharing working copies with multiple people?
BOb
ubversion repository and see how long that takes.
Was the command line checkout time any different?
>
>
>
>
>
>
> From: kmra...@rockwellcollins.com [mailto:kmra...@rockwellcollins.com]
> Sent: 01 August 2013 15:20
>
I cannot turn off the anti-virus part and check.
That's unfortunate. Are you able to at least tell it to ignore your development
root folder. We have corporate virus software too, but I am allowed to exclude
folders, so I exclude c:\users\bob\development. Virus Software can really mess
up
?
One of the biggest slowdowns on windows is Virus Software. Are you running any.
Also, have you tested using the svn command line to do the checkout to see if
it is any faster? Most virus software ignores command line apps.
BOb
found it a strong part of svn that subdirectories of a repository are
> repositories themselves).
> >
> >
> >
> > Is there any way to check out or update to revision r900?
>
> I don't think so. Since the canonical "name" of an item in the repository i
e" of an item in the repository is a
combination of the full path and the rev number
(^maindir/new_dir/foobar/what_I_work_with@123456) you can't update a path to a
revision in which that path didn't exist.
You would have to check out rev900 from the original path.
You could try:
Svn co -r 900 ^maindir/new_dir/foobar/what_I_work_with@123456
But, I'm not sure if that will work.
BOb
ies and tools are checked in as binaries.
So the correct answer, as with almost anything in development is, it
depends.
BOb
>
>
> *
> "Le contenu de ce courriel et ses event
rsion of svn 1.8.1. You only need to look at the
file names to determine that.
BOb
>
> That is, I simply run TortoiseSVN, check stuff in and out of my unfuddle
> repository, and am deliberately and blissfully unaware of all the machinations
> that happen when I right click in Expl
It’s users-unsubscribe …
BOb
From: Alexander Ivanenko [mailto:kito...@mail.ru]
Sent: Wednesday, June 19, 2013 3:19 AM
To: users@subversion.apache.org
Subject: please unsubscribe me from the list
Please unsubscribe me from the list,
unsubscribe-us...@subversion.apache.org<mailto:unsubscribe
Did you try it without using Dry Run... I have found at times that can cause
issues. There's really no need to use dry run since you can just revert. Just
make sure you have no pending changes in your target working copy.
From: C M [mailto:cmanalys...@gmail.com]
Sent: Monday, June 17, 2013 12:39
essage I assume that your "branch" install a copy of your trunk,
>hence not "ancestrally related".
It "thinks" there is a relationship because you are doing a merge. I'm not sure
why the "ignore ancestry" doesn't solve the issue though.
Since trunk is empty... why not just delete trunk and copy that branch to trunk?
BOb
d/test local that the build server
runs.
3. If step two is successful commit to the server.
BOb
> > So what's the actual problem (or problems) with SVN's branching and
> > tagging? Where does it hurt your workflow? What would make SVN not
> > "hurt you" in that way?
> >
> > Please be concrete, and give examples of what really bothers you as a
> > user or an admin in your daily work. Saying th
ot;tag" command that added metadata to a revision
which I think someone showed an example of earlier in this thread, you could
still use the "copy" command to get a writeable tag directory like you have
now. Frankly, if you are writing to tags it is more like a branch. ;)
BOb
> > .. snip
> >
> > You keep saying "svn doesn't support branches" yet I use branches
> > every day. While there is no way to "list branches" it would be
> > possible. I think the current implementation records the parent path
> > in the branch, but not vice versa... I assume svn doesn't do this
>
> On Tue, May 21, 2013 at 9:23 AM, Bob Archer wrote:
> >>>
> >> You are confused. This discussion is about how subversion lacks any
> >> support for branching, which is quite obvious to anyone who
> >> understands and acknowledges that all subversion
of the path is still in
the repo? That's what your example seemed to show. I think people want
obiliterate to deal with that issue. You can delete any path and still see it
in the history if you ask for it.. Isn't keeping that history the whole point?
BOb
> On 05/18/2013 08:33 PM, David Chapman wrote:
> > On 5/18/2013 12:01 PM, Zé wrote:
> >> On 05/18/2013 07:16 PM, David Chapman wrote:
> >>>
> >>> You are pretty insistent that there is One True Way to use branches
> >>> in development.
> >>
> >> No, I'm stating that if all a SCM does is track chang
g to merge.
That said, I don't even think you can specify in git "what" to merge it just
merges all the changes. I think it is possible to do a cherry-pick, but I think
that creates a diff basically and applies that to the target.
BOb
>
> >> The nature of branch
> On 05/13/2013 10:04 AM, Bob Archer wrote:
> > What I don't understand is why someone argues about how git does
> > something is better yet uses svn. Use the tool that works for you, or
> > works the way you expect a tool to work.
>
> Oh, I'm sure if we
nly true if this change is 1.something. But, if it is 2.0 then the svn
rules allow for a break in backward compatibility.
What I don't understand is why someone argues about how git does something is
better yet uses svn. Use the tool that works for you, or works the way you
expect a tool to work.
BOb
could if we wanted
to. However, the build scripts would have to be changed a bit since artifacts
are copied to a folder based on version number atm.
Once again, whatever works best for you. Using a trunk that was never the same
version from week to week didn't work for us. We also were doing a lot of
cyclic merges and needed a better way.
BOb
> -Original Message-
> From: Z W [mailto:mpc8...@gmail.com]
> Sent: Wednesday, April 24, 2013 4:26 PM
> To: Bob Archer
> Cc: Johan Corveleyn; users@subversion.apache.org
> Subject: Re: merge using same revision number - quick question
>
>
>
> On Wed, Apr 2
> On Wed, Apr 24, 2013 at 9:32 AM, Bob Archer wrote:
> > Hi Johan, Bob and all
> >
> > We took your suggestion and it still fails in that
> > 1- when we try to merge again at the root level
> > (goals:
> > a- to move subtree merge done previously to the
> Hi Johan, Bob and all
>
> We took your suggestion and it still fails in that
> 1- when we try to merge again at the root level
> (goals:
> a- to move subtree merge done previously to the working copy root level so
> that the past merge can be traced at the root level
ments? That would
> totally mess up normal use of "svn blame", among the other usual problems.
>
I agree. It seems to me that a CI build process should be generating BLAME
audit documents for the auditors that could be checked into another repository.
The devs should OWN the source, not the auditors!
BOb
est.com/svn/root/src/usr/ext/b.java
>
> as opposed to
> svn merge -c 345 https://test.com/svn/root/src/usr/ext
>
>
> Thanks all.
The resulting commit would probably be the same... although I expect the merge
info would be applied to the files rather than the folder. Give your simple
example a try in a test repo.
BOb
new url, and
then you can stop the svnserve service.
>
> Regards
> Support Team.
>
> From:
> Bob Archer
> To:
> Krishnamoorthi Gopal , Ryan Schmidt 20...@ryandesign.com>
> Cc:
> Joseba Ercilla Olabarri , Mark Phippard
> , "users@subversion.apache.
d svnserve.conf)
>
> Instead Of we are plan to use windows Active directory account for SVN.
>
If you use SVN Edge it is very easy to use your windows domain logins with it.
You just need to know your active directory server, OU names and such. We have
ours set up this
> I am handling SVN operations in my company.
> Today we find that SVN Speed is too much slow.
>
> VisualSVN Server : 2.5.7
> Tortoise SVN : 1.6
Is that a question?
Slow where? Client? 1.7 shows to be much faster for many client side
operations.
BOb
of course you would have to remove \c from \e. Also, the svn copy command
doesn't have advanced options like your shell does to copy files exclusive of
folders and stuff.
Hth,
BOb
> Note that we want to keep the original structure in place as well as have the
> new one which is why I am playing with COPY instead of MOVE or SWITCH.
> # Remove prop for old project-folder
> sed -i "/Node-path: $project/,/PROPS-END/d" $project.$rev.bak
>
> svnadmin load --ignore-uuid $project < $project.$rev.bak
> let i=$i+1
> rm -fr $project.$rev.bak
> done
>
> svnadmin setuuid $project
>
> Please notice that the rewrite of the revision-numbers has mitigated the node-
> copyfrom-rev somewhat but not entirely as it seems like node-copyfrom-repo
> points incorrectly sometimes when dumping this way.
You are manually trying to modify the dump file? Is there a reason you are not
using svndumpfilter?
BOb
> Hi
> I've encountered a strange problem, hopefully someone can help me here.
> Below is a diagram of our repo
> ->trunk--mod ABC-+
> + |
> | |
>
on the
branch from trunk of the revision which your integrate merge was committed as.
BOb
>
>
>
> BOb
>
>
>
> >
> > On Feb 22, 2013, at 7:22 PM, Matthew Pounsett
> > wrote:
> >
> > >
> > > On 2013/02/22, at 14:15, James Hanle
t; conflicts.
You can keep the feature branch alive by doing a record only merge on the trunk
of the revision which your integrate merge was committed as.
BOb
>
> On Feb 22, 2013, at 7:22 PM, Matthew Pounsett
> wrote:
>
> >
> > On 2013/02/22, at 14:15, James
cache for all repos (and
> not
> just this one). Checked the commit log again from the 2 paths mentioned and it
> still shows different log messages as posted in my original message.
Then I expect someone changed the revprop on either the branch or the trunk.
BOb
1 - 100 of 558 matches
Mail list logo
