headers
hgsubversion | 1 Mar 2011 04:47

push by durin42 - Added tag 1.2.1 for changeset 4bbc6bf947f5 on 2011-03-01 03:47 GMT

Revision: 836aa282f1
Author: Augie Fackler <durin42@...>
Date: Mon Feb 28 19:45:44 2011
Log: Added tag 1.2.1 for changeset 4bbc6bf947f5
http://code.google.com/p/hgsubversion/source/detail?r=836aa282f1

Modified:
  /.hgtags

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To post to this group, send email to hgsubversion@...
To unsubscribe from this group, send email to hgsubversion+unsubscribe@...
For more options, visit this group at http://groups.google.com/group/hgsubversion?hl=en.
Permalink | Reply | 0 comments |
headers
Patrick Mezard | 2 Mar 2011 21:07
Picon

[PATCH] externals: ignore externals blank or comment lines

# HG changeset patch
# User Patrick Mezard <pmezard@...>
# Date 1299096390 -3600
# Node ID ac3d6b81635bd770d6a498c4ba1dde6043041e08
# Parent  836aa282f1f8e235b4a953a856ef4762bdddd479
externals: ignore externals blank or comment lines

diff -r 836aa282f1f8 -r ac3d6b81635b hgsubversion/svnexternals.py
--- a/hgsubversion/svnexternals.py	Mon Feb 28 21:45:44 2011 -0600
+++ b/hgsubversion/svnexternals.py	Wed Mar 02 21:06:30 2011 +0100
 <at>  <at>  -139,6 +139,9  <at>  <at> 
     defs = []
     for base in sorted(exts):
         for line in exts[base]:
+            if not line.strip() or line.lstrip().startswith('#'):
+                # Ignore comments and blank lines
+                continue
             try:
                 path, rev, source, pegrev, norevline = parsedefinition(line)
             except BadDefinition:
diff -r 836aa282f1f8 -r ac3d6b81635b tests/fixtures/externals.sh
--- a/tests/fixtures/externals.sh	Mon Feb 28 21:45:44 2011 -0600
+++ b/tests/fixtures/externals.sh	Wed Mar 02 21:06:30 2011 +0100
 <at>  <at>  -37,7 +37,10  <at>  <at> 
 svn ci -m "set externals on ."
 # Add another one
 cat > externals <<EOF
+# A comment, then an empty line, then a blank line
+
 ^/externals/project1 deps/project1
(Continue reading)

Permalink | Reply | 0 comments |
headers
Christian Spann | 3 Mar 2011 23:17

Cannot push my changes back to SVN repository

Hi,

I managed to create a set of changes that I cannot push back to the
svn repo that i cloned my hg repo from. What I did:

hg clone svn_repo

some commits

hg pull

hg rebase (probably not --svn)

some commits..

I had some issues with my folder containing the repo as i tried to use
it as offline folder on win7 and copied it around several times ...
but that shouldn't make any difference...

When I now do hg incoming it says the whole repo is new to him and
wants to import the whole history

hg outgoing gives no changes

I also tried to clone the svn repo again, push the changes from
"corrupted" one over and push back. But there I get the same
situation. Where is my fault?

Regards, Chris
(Continue reading)

Permalink | Reply | 2 comments |
headers
Dominik Psenner | 4 Mar 2011 08:11
Picon
Gravatar

RE: Cannot push my changes back to SVN repository

You most probably rebased the whole repository, which creates new changesets
for every previous changeset. Rebase is usually only used to "move" commits
from one base changeset to another base changeset.

O   a
|
O O b
| |
O O c
|/
O   d (svn)
|

Considering the DAG above you could rebase the changesets b and c on top of
a, thus changing the ancestor of c from d to a creating this DAG:

O   b
|
O   c
|
O   a
|
O   d (svn)
|

Exactly this operation is needed before you push branches back into SVN as
SVN knows only a linear history and one would loose the branch meta-data
otherwise.

Greetings,
(Continue reading)

Permalink | Reply | 1 comment |
headers
Christian Spann | 4 Mar 2011 17:27

Re: Cannot push my changes back to SVN repository

Hi Dominik,

Thanks for your fast reply! My rebase was like you wrote ...
unfortunately because this then is probably not the problem. What I did
there was:
a o   
   |   
b o o c (new update from svn)
   |/
d o
   |
   ...
to

o a (tip)
|
o b
|
o c
|
o d
|
...

But now as i wrote hg push wont commit a and b back to the svn repo
because it says there are no changes .. Any ideas what mistake i made or
how to find out what the problem might be?

Regards,
Chris
(Continue reading)

Permalink | Reply | 0 comments |
headers
Dan Villiom Podlaski Christiansen | 6 Mar 2011 01:30
Picon
Gravatar

Packager, please don't disable tests

Hi,

Someone recently mentioned on our IRC channel that the Gentoo build  
file for hgsubversion disables some of our tests.[1] This doesn't seem  
a terribly good idea.

The hgsubversion test suite is quite comprehensive, and most tests are  
simplified versions of scenarios seen in real-world repositories. A  
failing test is an indication that something is wrong, and disabling  
the test merely suppresses that indication without addressing the  
underlying issue. Assuming your test setup is indicative of the  
experience your users will get, you are subjecting them to a broken  
package known to either fail or cause incorrect results in certain  
circumstances.

So, please don't disable any tests when packaging hgsubversion. If the  
test failures are caused by bugs in hgsubversion, please report them  
to us so they may be fixed. If the test failures are caused by  
something in your environment, please report them; perhaps we can help  
you address this or work around it in our code. In the mean time, it  
would be prudent to not upgrade the package. Instead, the worst  
possible course of action was chosen: don't tell anyone about the  
breakage, disable the tests, and ship broken code to users.

Please help us rectify this, and please don't do it again.

[1]
<http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-vcs/hgsubversion/hgsubversion-1.2.1.ebuild?view=markup#l30 
 >
(Continue reading)

Permalink | Reply | 0 comments |
headers
Christian Spann | 7 Mar 2011 00:54

Re: Cannot push my changes back to SVN repository

Hi,

Thanks to Dominik I easily fixed the problem:

I exported my 5 changesets via the tortoisehg export feature, all at
once into 5 patchfiles. Then I applied them to a fresh clone of the svn
repo and pushed them back. The cause was probably a hg rebase without
--svn which corrupted the repo.

Thanks for your support,

Christian

Am 05.03.2011 15:18, schrieb Dominik Psenner:
> backout the changes, clone svn, apply the patches manually and then
> push back. you may have mis-used rebase which results in a
> incompatible dag to svn.
>
> 2011/3/4 Christian Spann <chaosguardx@...>:
>> Hi Dominik,
>>
>> Thanks for your fast reply! My rebase was like you wrote ...
>> unfortunately because this then is probably not the problem. What I did
>> there was:
>> a o
>>   |
>> b o o c (new update from svn)
>>   |/
>> d o
>>   |
(Continue reading)

Permalink | Reply | 1 comment |
headers
Dominik Psenner | 7 Mar 2011 09:13
Picon
Gravatar

RE: Cannot push my changes back to SVN repository

Hi Christian,

I'm glad I was able to help you solve your problem. Do you have ideas how
hgsubversion could be improved making it easier to use? What was the reason
you didn't use rebase with --svn switch?

Greetings,
D.

> -----Original Message-----
> From: Christian Spann [mailto:chaosguardx@...]
> Sent: Monday, March 07, 2011 12:55 AM
> To: Dominik Psenner; hgsubversion@...
> Subject: Re: Cannot push my changes back to SVN repository
> 
> Hi,
> 
> Thanks to Dominik I easily fixed the problem:
> 
> I exported my 5 changesets via the tortoisehg export feature, all at
> once into 5 patchfiles. Then I applied them to a fresh clone of the svn
> repo and pushed them back. The cause was probably a hg rebase without
> --svn which corrupted the repo.
> 
> Thanks for your support,
> 
> Christian
> 
> Am 05.03.2011 15:18, schrieb Dominik Psenner:
> > backout the changes, clone svn, apply the patches manually and then
(Continue reading)

Permalink | Reply | 0 comments |
headers
hgsubversion | 8 Mar 2011 22:32

push by durin42 - externals: ignore externals blank or comment lines on 2011-03-08 21:32 GMT

Revision: a5be5ca638
Author: Patrick Mezard <pmezard@...>
Date: Wed Mar  2 12:06:30 2011
Log: externals: ignore externals blank or comment lines
http://code.google.com/p/hgsubversion/source/detail?r=a5be5ca638

Modified:
  /hgsubversion/svnexternals.py
  /tests/fixtures/externals.sh
  /tests/fixtures/externals.svndump
  /tests/test_externals.py

--

-- 
You received this message because you are subscribed to the Google Groups "hgsubversion" group.
To post to this group, send email to hgsubversion@...
To unsubscribe from this group, send email to hgsubversion+unsubscribe@...
For more options, visit this group at http://groups.google.com/group/hgsubversion?hl=en.
Permalink | Reply | 0 comments |
headers
Patrick Mezard | 9 Mar 2011 22:09
Picon

[PATCH 1 of 3] editor: rename add_directory() cp_f* variable into from*

# HG changeset patch
# User Patrick Mezard <pmezard@...>
# Date 1299704825 -3600
# Node ID 3173f418079c5901446bda2153c5c9aa91082253
# Parent  a5be5ca638de0b69d4f146a245affce24ff8e443
editor: rename add_directory() cp_f* variable into from*

diff -r a5be5ca638de -r 3173f418079c hgsubversion/editor.py
--- a/hgsubversion/editor.py	Wed Mar 02 21:06:30 2011 +0100
+++ b/hgsubversion/editor.py	Wed Mar 09 22:07:05 2011 +0100
 <at>  <at>  -231,11 +231,11  <at>  <at> 
         if tag:
             changeid = self.meta.tags[tag]
             source_rev, source_branch = self.meta.get_source_rev(changeid)[:2]
-            cp_f = ''
+            frompath = ''
         else:
             source_rev = copyfrom_revision
-            cp_f, source_branch = self.meta.split_branch_path(copyfrom_path)[:2]
-            if cp_f == '' and br_path == '':
+            frompath, source_branch = self.meta.split_branch_path(copyfrom_path)[:2]
+            if frompath == '' and br_path == '':
                 assert br_path is not None
                 tmp = source_branch, source_rev, self.current.rev.revnum
                 self.meta.branches[branch] = tmp
 <at>  <at>  -243,17 +243,17  <at>  <at> 
         if new_hash == node.nullid:
             self.current.missing.add('%s/' % path)
             return path
-        cp_f_ctx = self.repo.changectx(new_hash)
(Continue reading)

Permalink | Reply | 0 comments |

Gmane