bugmonotone - Bugs: bug #13063, continuation from 13032:...


You are not allowed to post comments on this tracker with your current authentication level.

bug #13063: continuation from 13032: cvs_import still creates wrong data on branch

Submitter:  None
Submitted:  Thu 12 May 2005 03:48:28 PM UTC
Category:  storage system Severity:  3 - Normal
Item Group:  incorrect behavior Status:  None
Privacy:  Public Assigned to:  None
Open/Closed:  Open
mtn version --full: 

monotone 0.19 (base revision: 57500fcac100c132527563af2155a89cf84f62cc)
Running on: Linux 2.6.11-1.1287_FC4 #1 Thu May 5 16:31:22 EDT 2005 i686
Changes since base revision:

new_manifest [a54613ceedba928cd5f5d83fd9deebdcec4ddc82]

old_revision [57500fcac100c132527563af2155a89cf84f62cc]
old_manifest [d3e8bae1e267c1217430a1f394e48e85d28225bc]

patch "monotone.spec"
 from [1619421422b66900ee8324ed77c7c82f34d0752d]
   to [6b1b93f6d47c68f3af6e8d66b85444481c7b3d02]

patch "po/monotone.pot"
 from [85997f09b04320ce8cbc0972e57a3fbfb5be38da]
   to [78d9cc9c1e54a8164dd9b78b24000e40d3d7081a]

  Generated from data cached in the distribution;
  further changes may have been made.

  Generated from data cached in the distribution;
  further changes may have been made.

  Generated from data cached in the distribution;
  further changes may have been made.

* Mandatory Fields

Add a New Comment (Rich Markup)

Comment Type & Canned Response:
       No canned response available


Mon 16 May 2005 10:43:24 AM UTC, comment #1: 

I believe I have corrected this bug with my changes in revision
be6e404d588dcf10b544e1d64f8d2ec4bc0982c8, which restructures the branch inference system according to your recommendations. please confirm it functions according to your expectations.

graydon hoare <graydon>
Project Member
Thu 12 May 2005 03:48:28 PM UTC, original submission:  

[I apparently cannot add to bug 13032 since I have no account]

The patch checked it indeed changes the behavior, but the result is still not correct.  I get

2004-01-05  Ulrich Drepper  <drepper@redhat.com>

        * Makefile.am: Support separate libelf built.

        * elfutils.spec.in: Create separata elfutils-libelf-devel package.
        Install libdw DSOs.

        * configure.ac (AC_CONFIG_SRCDIR): Use libelf/libelf.h as the file

while the result should be

2005-02-22  Ulrich Drepper  <drepper@redhat.com>

        * Makefile.am (all_SUBDIRS): Don't add doc subdir for now.
        * configure.ac: Don't use doc subdir for now.

2005-02-15  Ulrich Drepper  <drepper@redhat.com>

        * configure.ac: Remove AM_GNU_GETTEXT use.  Use only AM_PO_SUBDIRS.

This did not surprise me since, as I wrote to Nathaniel in a private mail, there seems to be a fatal flaw in the implementation.  I haven't looked at the actual code but the fact that the content or appearence of one file can effect the content of another file shows that.

The selection of a version associated with a branch point in one file is completely independent of the selection of a branch point in another file.  One file might not be modified from day 1 (and might have dozens of branch names associated with it) while others change frequently and have high version numbers.  The only guarantee is that all names are on the same branch or the trunk.

For the import this means monotone has to determine the sequence in which the names are created (easy: sort by version number associated with the name) and then for each file on the branch/trunk which is smaller than the branch number, add the revisions.  Not sure how/whether you group them to simulate simultaneous checkins as patchsets.  And I assume 1.23 <

In this process there is absolutely no dependence on the version number in another file.  The glue is the name and the name to version mapping has to be done for each file separately.

I think this is all obvious and maybe you feel lectured about the obvious, but the characteristics of the bug make me believe that the current code does something different.



(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach Files:

No files currently attached


Depends on the following items: None found

Items that depend on this one: None found


CC list is empty


There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

Only logged-in users can vote.





Follows 1 latest change.

Date Changed by Updated Field Previous Value => Replaced by
2005-05-13 mkj Carbon-Copy- Added mkj

Back to the top

Powered by Savane 3.9