gramps

Email Archive: gramps-devel (read-only)

2001:	_Jan	_Feb	_Mar	_Apr	_May (35)	_Jun (11)	_Jul (41)	_Aug (96)	_Sep (29)	_Oct (44)	_Nov (70)	_Dec (61)
2002:	_Jan (126)	_Feb (31)	_Mar (64)	_Apr (84)	_May (57)	_Jun (56)	_Jul (20)	_Aug (23)	_Sep (31)	_Oct (19)	_Nov (60)	_Dec (34)
2003:	_Jan (30)	_Feb (61)	_Mar (32)	_Apr (30)	_May (78)	_Jun (55)	_Jul (111)	_Aug (108)	_Sep (104)	_Oct (98)	_Nov (92)	_Dec (73)
2004:	_Jan (71)	_Feb (70)	_Mar (68)	_Apr (40)	_May (118)	_Jun (51)	_Jul (71)	_Aug (251)	_Sep (77)	_Oct (155)	_Nov (74)	_Dec (57)
2005:	_Jan (183)	_Feb (94)	_Mar (170)	_Apr (242)	_May (233)	_Jun (42)	_Jul (69)	_Aug (70)	_Sep (99)	_Oct (60)	_Nov (65)	_Dec (210)
2006:	_Jan (169)	_Feb (99)	_Mar (31)	_Apr (179)	_May (142)	_Jun (72)	_Jul (131)	_Aug (98)	_Sep (110)	_Oct (189)	_Nov (262)	_Dec (207)
2007:	_Jan (376)	_Feb (255)	_Mar (168)	_Apr (174)	_May (167)	_Jun (192)	_Jul (197)	_Aug (171)	_Sep (307)	_Oct (572)	_Nov (454)	_Dec (471)
2008:	_Jan (707)	_Feb (365)	_Mar (464)	_Apr (410)	_May (251)	_Jun (142)	_Jul (112)	_Aug (143)	_Sep (94)	_Oct (280)	_Nov (337)	_Dec (232)
2009:	_Jan (508)	_Feb (491)	_Mar (363)	_Apr (280)	_May (186)	_Jun (250)	_Jul (231)	_Aug (487)	_Sep (189)	_Oct (344)	_Nov (456)	_Dec (439)
2010:	_Jan (514)	_Feb (725)	_Mar (591)	_Apr (256)	_May (209)	_Jun (75)	_Jul (118)	_Aug (248)	_Sep (230)	_Oct (393)	_Nov (368)	_Dec (276)
2011:	_Jan (457)	_Feb (308)	_Mar (358)	_Apr (277)	_May (333)	_Jun (320)	_Jul (198)	_Aug (186)	_Sep (87)	_Oct (238)	_Nov (123)	_Dec (129)
2012:	_Jan (127)	_Feb (182)	_Mar (208)	_Apr (134)	_May (230)	_Jun (138)	_Jul (126)	_Aug (176)	_Sep (231)	_Oct (235)	_Nov (164)	_Dec (219)
2013:	_Jan (316)	_Feb (371)	_Mar (393)	_Apr (165)	_May (253)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[Gramps-devel] svn merge problem

From: Stéphane Charette <stephanecharette@gm...> - 2009-02-22 11:05

I actually make use of the svn merge command.  From my non-GRAMPS
experience, not many developers usually bother with svn merge to bring
their fixes forward into trunk.  Once I fix something in a branch, I
then switch to trunk, and run svn merge -c <changeset>
<snv-branch-url>.

Problem is, this command is no longer working correctly for me.  It
has been a while since I worked on a GRAMPS branch (earlier 3.0.x
release) and had to merge to trunk, so I cannot say when this broke.
But as of tonight, when I try to merge, it takes about 15 minutes for
the command to complete.  Normally, this command takes maybe 1 second
to run, so the changed behaviour is quite obvious.

Does anyone else use svn merge?  Is it working for you?

Stéphane

Re: [Gramps-devel] svn merge problem

From: Gary Burton <bury_lancs@ya...> - 2009-02-22 11:58

> Does anyone else use svn merge?  Is it working for you?

I use merge too. I noticed it took quite a while the first time I merged a change into the new gramps31 branch but was OK after that. It modified a whole bunch of files in the plugin directory on my local repository - not code modifications but an attribute of some sort. I reverted all these changes and haven't seen the problem since.

Bye

Gary

Re: [Gramps-devel] svn merge problem

From: Stéphane Charette <stephanecharette@gm...> - 2009-02-22 19:20

> I use merge too. I noticed it took quite a while the first time I merged
> a change into the new gramps31 branch but was OK after that. It
> modified a whole bunch of files in the plugin directory on my local
> repository - not code modifications but an attribute of some sort. I
> reverted all these changes and haven't seen the problem since.

Actually...that brings up a good point.  SVN has some new-fangled
support for merge, but it only works when *all* the clients are using
version 1.5 or higher.  I'm using svn 1.5.1 that comes from the
repository with Ubuntu 8.10.

I see all the changes you mean.  There are 139 files with pending
changes now on my trunk waiting to be checked in, even though I
haven't changed anything.  All of them except for 3 are in the
src/plugins/ directory.  Running "svn diff" on any of these modified
files shows the following:

-----------------------------------------------------------------
$ svn diff src/plugins/tool/SoundGen.py
Property changes on: src/plugins/tool/SoundGen.py
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /branches/gramps31/src/plugins/tool/SoundGen.py:r12069-12070
-----------------------------------------------------------------

In case it makes sense to anyone, the only 3 files affected outside of
src/plugins are the following:

/trunk/src/DateHandler/_Date_it.py
/trunk/src/gen/plug/_manager.py
/trunk  (yeah, the root directory itself)

Stéphane

Re: [Gramps-devel] svn merge problem

From: Gary Burton <bury_lancs@ya...> - 2009-02-22 21:15

I just did another merge on gramps31 and got the same problem. It does look like changes brought about in svn 1.5.1. Not entirely sure what to do about it.

Bye

Gary

Re: [Gramps-devel] svn merge problem

From: Stéphane Charette <stephanecharette@gm...> - 2009-02-23 02:32

On Sun, Feb 22, 2009 at 13:15, Gary Burton <bury_lancs@...> wrote:
> I just did another merge on gramps31 and got the same problem.
> It does look like changes brought about in svn 1.5.1. Not entirely
> sure what to do about it.

If anyone else has a great idea, please speak up.  This has become a
show stopper for me.  Every time I do a merge it brings forward
changes to _hundreds_ of source files, and it is taking so long as to
be unusable for me.  This latest example took 24 minutes to merge
about 10 lines from 3.1.0 into trunk:

$ time svn merge -c 12087
https://gramps.svn.sourceforge.net/svnroot/gramps/branches/gramps31
--- Merging r12087 into 'src/plugins/webreport/NarrativeWeb.py':
U    src/plugins/webreport/NarrativeWeb.py
real	23m59.500s
user	0m1.224s
sys	0m2.472s

Stéphane