Hi All
We are using 1.6 SVN.
We have been syncing trunk to branch A and they are both synced up and
ready for merge.
We are trying to svn merge branch A to our trunk.
But the branch was not created right in that it has a missing directory.
eg.
branch A has src directory
src
Trunk has src and in
>
> Hi All
>
> We are using 1.6 SVN.
> We like to svn merge from our branch A to trunk.
> We have been diligent in svn merge from trunk to A.
> These svn merges from trunk to branch A also include --record-only merges
> too, in addition to regular merges.
> Development on branch A has stopped.
> No
Hi All
We are using 1.6 SVN.
We like to svn merge from our branch A to trunk.
We have been diligent in svn merge from trunk to A.
These svn merges from trunk to branch A also include --record-only merges
too, in addition to regular merges.
Development on branch A has stopped.
Now we like to merge
Hi All
We use svn 1.6
We have a list of revision numbers listed in mergeinfo property.
Over the months, different folks perform svn merge such that there's a svn
commit failing but mergeinfo is still updated with that revision number on
mergeinfo property?
We don't know which revision number first
Hi All
We are using svn 1.6 - we tried merging from Trunk to a feature branch
using svn merge (automatically).
We just found out that some files are not updated with the merges but
mergeinfo has already indicated and ci with the messages that those files
are merged.
We like to perform svn merge aga
Hi All
We are using svn 1.6 - we tried merging from Trunk to a feature branch
using svn merge (automatically).
We just found out that some files are not updated with the merges but
mergeinfo has already indicated and ci with the messages that those files
are merged
We like to perform svn merge agai
Hi All
We have a situation where a few folks dont use --reintegrate option when
performing svn merge, while others do.
What's
1- the consequence of not using --reintegrate option; can the feature
branch continue to svn merge to trunk the 2nd time and thereafter ?
2- the impact on those feature b
Hi All
1- Can one simply checkout a few folders in a directory as opposed to check
out everything under a directory ?
We have a folder what we don't want to check out but want to co all other
directories.
2- Once we checkout these directories (except one), we need to svn merge
from another branch
Hi All
Q: During SVN merge, does it read svn ignore list to ignore files,
directories to not merge them to a working copy directory from a repository
?
Thank you.
Sincerely
Hi All
We read folks posted online and it appears to show conflicting statements
on how to svn ignore multiple directories and files using svn propedit.
Suppose we have the following working copy directory structure.
/projectRoot (this working copy directory contains subdirectories build and
src
Hi All
We have a branch A
We svn copy A to feature branch Y
Time elapsed
We svn merge A to Y continuously
Time elapsed
We svn copy A to branch B (and decided B would be the "trunk")
Time elapsed
We have been merging B to Y continuously
We have been checking in jars to branch Y when making builds o
still don't see clearly its purpose.
Thanks Uli.
Thanks
On Tue, Jul 16, 2013 at 12:53 AM, Ulrich Eckhardt <
ulrich.eckha...@dominolaser.com> wrote:
> Am 12.07.2013 01:43, schrieb Z W:
>
> We have a trunk X and a feature branch Y (branched from X)
>>
>
> Your wor
Hi All
We have a trunk X and a feature branch Y (branched from X)
We have another branch Z (totally new code) and we need to copy branch Z to
inside branch Y
When we need to merge from branch Y to X, will it work ?
When do we decide to svn copy or svn merge for branch Z ?
Thank
elopment at code-freeze before creating a release branch.
Thanks
On Thu, May 9, 2013 at 10:21 AM, Zé wrote:
> On 05/07/2013 04:50 AM, Z W wrote:
>
>>
>> What's the best practice in use with SVN ?
>>
>
> Maybe this can give you some ideas on how to organize you
Hi Johan
Thanks for responding.
If we get a chance we'll let you know.
We're tight with time now.
Thanks
On Wed, May 8, 2013 at 5:25 AM, Johan Corveleyn wrote:
> On Wed, May 8, 2013 at 12:51 PM, Z W wrote:
> > Hi All
> >
> > We plan to merge from the trunk to
folder
https://some.url.com/svn/root/Trunk ?
We use SVN 1.6
Sincerely
On Wed, May 8, 2013 at 2:34 PM, Andrew Reedick
wrote:
> > From: Z W [mailto:mpc8...@gmail.com]
> > Sent: Wednesday, May 08, 2013 4:09 PM
> > To: Andrew Reedick
> > Cc: users@subversion.apache.org
> &
May 8, 2013 at 12:40 PM, Andrew Reedick
wrote:
> > From: Z W [mailto:mpc8...@gmail.com]
> > Sent: Wednesday, May 08, 2013 3:05 PM
> > To: users@subversion.apache.org
> > Subject: How to remove revision number in mergeinfo eligible list
> >
> > Hi All
> >
Hi All
We use SVN 1.6
We have a revision number which refuses to move to the merged list after
applying a merge.
[root@host branchWC]# svn mergeinfo --show-revs eligible
https://some.url.com/svn/root/trunk
r6554
[root@host branchWC]# svn merge -c 6554 --record-only
https://some.url.com/svn/root
Hi All
We plan to merge from the trunk to a feature branch using --record-only for
a few revisions numbers.
Is there a way to unblock a revision number after first using --record-only
?
Thanks
Sincerely
Hi Andrew
thanks for responding.
On Tue, May 7, 2013 at 2:14 PM, Andrew Reedick
wrote:
>
> > From: Z W [mailto:mpc8...@gmail.com]
> > Sent: Tuesday, May 07, 2013 11:53 AM
> > To: users@subversion.apache.org
> > Subject: mergeinfo between svn copied branches and mer
Hi All
we have branchA
we svn copy branchA to produce branchB
branches A and B continues development and checkins
branchA is merged to branch B continuously
branchA finishes, tagged
we then svn copy branchA to produce branchC
we like to continue branchC merging to branchB
we hear u clearly
Hi All
Suppose trunk has been merging to branch. would renaming a trunk (trunk
name change) causes an automatic change in the svn:mergeinfo of a branch so
that merged mergeinfo list and eligible merge info list remains intact
(from the branch perspective) ?
Then when branch needs to reintegrate t
n branch -
> /branches/yourname /branches/hername.
>
> Does that give you some ideas?
>
>
>
>
>
> Geoff Hoffman
> Solutions Architect & LAMP Engineer
> phone +1 623.399.4918
> mobile +1 480.231.8323
> web CardinalPath.com <http://goo.gl/TuuiO>
>
Hi All
For the trunk, what's the common practice to name a version of the trunk?
We have a trunk and it's not ready for branching.
We also feel that we need a more specific name for the trunk than what we
have now called version=trunk.
However, we can't be specific since we don't know what the bra
Hi All
We have been merging from trunk A to branch B; recently another branch C is
created out of trunk A; trunk A is frozen and C has become the new trunk
for us;
We mistakenly co the trunk C and performed
svn propdel svn:mergeinfo -R
svn revert .
svn commit -m "should not have done it"
Now whe
Hi All
We have been merging from trunk A to branch B; recently another branch C is
created out of trunk A; trunk A is frozen and C has become the new trunk
for us;
1- will the mergeinfo in Trunk A be copied over to Trunk C so that we can
continue merging from Trunk C to branch B
2- would be there
Hi All
We like to ignore a set of jar files under our working copy root directory:
working copy root dir: /scratch/testMerge
working copy jars dir: /scratch/testMerge/build/jars
We tried to perform merging from a trunk to our working copy branch and it
failed because one of the jar ins
On Wed, Apr 24, 2013 at 6:16 PM, Branko Čibej wrote:
> On 24.04.2013 23:06, Z W wrote:
> >
> >
> >
> > On Wed, Apr 24, 2013 at 1:42 PM, Mark Phippard > <mailto:markp...@gmail.com>> wrote:
> >
> > On Wed, Apr 24, 2013 at 4:40 PM, Bo
On Wed, Apr 24, 2013 at 1:42 PM, Mark Phippard wrote:
> On Wed, Apr 24, 2013 at 4:40 PM, Bob Archer wrote:
> > Please check the poperties on one of the files. Tell me what the
> mergeinfo: is prior to your merge
> > and after your merge. Up to this point we were talking about
> generalities, but
On Wed, Apr 24, 2013 at 1:40 PM, Bob Archer wrote:
> > -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: merg
On Wed, Apr 24, 2013 at 1:30 PM, Mark Phippard wrote:
> On Wed, Apr 24, 2013 at 4:25 PM, Z W wrote:
>
> > Hi Bob, we're still seeing the problem of unwanted touches of files and
> > directories on new unmerged rev numbers, even after we reapply all merges
> > for a
On Wed, Apr 24, 2013 at 9:50 AM, Bob Archer wrote:
> > 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
On Wed, Apr 24, 2013 at 9:50 AM, Bob Archer wrote:
> > 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
Hi Bob
Thanks for your response.
What does elided mean ?
We do see the revision numbers are moved from eligible to merged in svn
mergeinfo after a "svn merge" and "svn commit"
How do we stop top posting and adhere to the rules ? We're new.
Thank you
Sincerely
On Wed, Apr 24, 2013 at 9:32 AM, B
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 using "svn mergeinfo
-show-revs merged)
s
Hi All
How does one use --record-only option with svn merge ?
Is it used when a revision number is found in svn mergeinfo eligible list
and returns no changes ?
ie
eg r234455 is on the eligible list but when applied with svn merge, there's
no change.
Is that when we use --record-only option after
Hi All
We have 1.6 SVN.
Can svnmerge.py and svn merge be used on the same working copy directory
for merging from trunk to branch ?
Thanks
Hi Bob
Thanks for responding. I tried it and it seems to merge ok.
We're usng SVN 1.6
We tried using svn mergeinfo to help us with finding relevant revisions to
merge from a trunk to a branch.
But when we query for merged, (even for the one above),
svn mergeinfo --shows-revs merged
https://test.c
Hi All
We have a revision that contains a few changed files on the trunk:
r345
/usr/ext/a.java
/usr/ext/b.java
We like to merge this a branch working copy.
Can we perform multiple merge svn with the same revision number ?
We have a reason to do that; We know it doesnt make sense in this simple
ex
Hi All
We're new to SVN.
We think we got the basics but like to know more.
We having been using SVN updates with Hudson and it uses the SVNkit as
a SVN client.
We notice that sometimes zip file is NOT updated from the SVN server.
On another occasion, we're not sure why when someone checks in the
Hi All
We like to perform frequent automatic svn merges between our trunk and
our branches but we don't have much experience with svn merging.
We read that Svnmerge.py could help but we weren't sure as we read
elsewhere that svn 1.6 does merges similar to Svnmerge.py, and so
Svnmerge.py should no
Hi All
We are SVN newbies here.
We plan to do an svn copy (of a branch to another trunk).
Does "svn copy" command copies all the history of the file and folder
revisoins too ?
Thanks
Hi All
We like to stop commits to a certain tree or branch.
Is there a way to do that on SVN ?
Is this an svn admin command ?
Thanks
Hi All
We're new to subversion.
We like to make sure we get the latest svn revision number from the
svn repository on the remote server.
We are confused as to which command to use to find our latest revision number.
Questions
1-
Which is correct -
svn info url or
svnlook youngest
2-
We thought s
Hi All
We are new to SVN.
We are unsure where to configure in SVN, if needed, while using it
with Jenkins/Hudson CI tool.
We have a big chained job that runs for about an hour. Chained job
meaning several jobs combined using downstream connections of jobs.
We have the following problem, which is
Hi
We are new to SVN.
We found that our Jenkins CI is configured to use Subversion Workspace
Version 1.6 (svn:externals to file)
We also found that the SVN server is using SVN version Subversion 1.6.16
When running our build, we get the following errors:
Svn : Sending changes from your working c
Hi
We are new to SVN.
We found that our Jenkins CI is configured to use Subversion Workspace
Version 1.6 (svn:externals to file)
We also found that the SVN server is using SVN version Subversion 1.6.16
When running our build, we get the following errors:
*Svn : Sending changes from your working
47 matches
Mail list logo
