n: Bo Berglund [bo.bergl...@gmail.com]
Gesendet: Mittwoch, 6. Dezember 2017 21:03
An: users@subversion.apache.org
Betreff: Re: Moving CVS to SVN - multiple repositories with different
permissions
On Wed, 6 Dec 2017 14:40:20 +0000, Andreas Tscharner
wrote:
>I maintained cvsnt for Debian for a wh
ing
> -kbx on some binary files requiring exclusive editing etc.
Don't forget the mergepoints which were set automatically...
Best regards
Andreas
--
Andreas Tscharner andreas.tschar...@wenzel-metromec.ch
d a Linux laptop and the Linux cvsnt binary and did all on a Linux box,
because Python was a PITA on Windows back then.
Best regards
Andreas
--
Andreas Tscharner andreas.tschar...@wenzel-metromec.ch
Gordon's Law:
If you think you have the solution, the question was poorly phrased.
, otherwise you
cause problems for everyone else...
The main reason we changed from SVN to git were the merge problems we've had
with SVN.
Freundliche Grüsse / Best Regards
Andreas Tscharner
Entwickler / Developer
Phone: +41 81 257 07 47
E-Mail: andreas.tschar...@wenzel-metromec.ch
consuming to fix. The question I have is
I don't want to offend anyone here, but such bogus merge conflicts were the
reason we changed to git.
> anyone know what I could’ve done to create these false conflicts?
>
Not to my knowledge...
Best regards
WENZEL Metromec AG
Andr
r evaluation lasts until the 7th of March, so I cannot say what our results
are, but I think a DVCS is worth a try.
Best regards
WENZEL Metromec AG
Andreas Tscharner
--
Andreas Tscharner, Development
WENZEL Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland
phone:
Freundliche Grüsse
WENZEL Metromec AG
Andreas Tscharner
--
Andreas Tscharner, Development
WENZEL Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland
phone: +41 (0)81 257 07 00
fax:+41 (0)81 257 07 01
e-mail: mailto:andreas.tschar...@metromec.ch
www
his is a limitation of subversion. Subversion does not track renames/moves for
merging.
Best regards / Freundliche Gr?sse
WENZEL Metromec AG
Andreas Tscharner
--
Andreas Tscharner, Development
WENZEL Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland
phone: +
nefit for the user if SVN warns about that fact during
"svn add"...
Best regards
Andreas
--
Andreas Tscharner
--
"Intruder on level one. All Aliens please proceed to level
e-add them in the svn repo.
Of course this works only if there are only a few files (it was 6 in our case)
The actual cause in our case was: CVSNT (!) has saved these files (they were
all binary) with a '0' somewhere in the file what the converter didn't l
and DIRECTORIES that are newer an
the server. To show only these files, one should probably pipe the output
through grep (Check for the star "*")
svn status -u | grep \*
This shows you only the files however and
ersion would be a preview what changes "svn
update" would apply.
Best regards
Andreas
--
Andreas Tscharner
--
"Intruder on level one. All Aliens please proceed to level one."
-- Call in "Alien: Resurrection"
st regards
Andreas
--
Andreas Tscharner
--
"Intruder on level one. All Aliens please proceed to level one."
-- Call in "Alien: Resurrection"
I am actually asking, because I am thinking about deplyoing 1.7.x in our
company, but as long as this bug is not fixed, I am hesitating...
Best regards
Andreas
--
Andreas Tscharner
--
"Intruder
d Compare.
Best regards
Andreas
--
Andreas Tscharner
--
"Intruder on level one. All Aliens please proceed to level one."
-- Call in "Alien: Resurrec
an interval) on a given
SVN repository URL. If the revision in that repository changes, the Jenkins
tasks will start by updating or checking out the given URL (it's configurable).
No need for a hook...
Best regards
Andreas
Freundliche Grüsse
Wenzel Metromec AG
Andreas Tscharne
and login after you have added yourself to the
shortfall group?
Best regards / Freundliche Grüsse
Wenzel Metromec AG
Andreas Tscharner
--
Andreas Tscharner, Development
Wenzel Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland
phone: +41 (0)81 257 07 00
fax:+
e) has to be renamed...
Best regards
Andreas
--
Andreas Tscharner
--
"Intruder on level one. All Aliens please proceed to level one."
-- Call
e SVN manual and did, but looking
> for real life experiences. I did a google search for some
> information but a helping hand to further my research would
> be appreciated.
Did you see:
http://svn.apache.org/repos/asf/subversion/trunk/doc/user/svn-best-practices.html
Best regards
or git.
While I don't know git, in Mercurial you have the possibility to save and
export you changes as so-called bundle at one site and import them at the other
site. For more information: http://www.selenic.com/mercurial/hg.1.html#bundle
orrect. That page indicates that the extension is -> hg. I
have read (like I said on my first mail: I haven't try that myself) that it
works also the other way around somewhere else, most probably on
stackoverflow...
Best regards/Freundliche Grüsse
Wenzel Metromec AG
Andreas
s extension accepts a
Mercurial repo as source and SVN as destination. Having said that, I have never
tried it, but you might give it a shot. Details are here:
http://mercurial.selenic.com/wiki/ConvertExtension
Best regards/Freundliche Grüsse
Wenzel Metromec AG
Andreas Tscharner
--
Andre
few references on 1.7.x
here...
The news in the upcoming 1.7.x you'll find here:
http://subversion.apache.org/docs/release-notes/1.7.html
... but no release date though
Best regards / Freundliche Grüsse
Wenzel Metromec AG
Andreas Tscharner
--
Andreas Tscharner, Developm
sitories.
Now I tried it again and it worked! The trunk was on the latest reivision and
it was the latest revision in the whole repository.
Thank you very much and best regards / Freundliche Grüsse
Wenzel Metromec AG
Andreas Tscharner
--
Andreas Tscharner, Development
Wenzel Metro
> in at the same folder level from where you branched?
No, it's a normal checkout, and I was and am merging at the same folder level
(_dev) from where I branched.
I noticed however that the mentioned files have been changed in another branche
and then were merged to trunk (w
the
files and directories were lost)?
TIA and best regards
Freundliche Grüsse
Wenzel Metromec AG
Andreas Tscharner
--
Andreas Tscharner, Development
Wenzel Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland
phone: +41 (0)81 257 07 00
fax:+41 (0)81 257 07 01
e-m
26 matches
Mail list logo