Info about merged changes in svn commit log

Am Mittwoch, den 07.01.2009, 22:46 +0000 schrieb Marcin Zajaczkowski:
> New question #56687 on Bazaar Subversion Plugin:
> https://answers.launchpad.net/bzr-svn/+question/56687
>
> Hi,
>
> When there is a merge made in a Bazaar branch it's perfectly visible in "bzr log [-v]" command (who, what, when, ...). After commit to branched/checked out svn branch it is flatten. Is there a simple way to get that info even in svn comment (like for example svnmerge.py tool do)?
This happens because only that revision is pushed and not any of the
merged revisions. You can push those revisions by using --merged option
to svn-push.

Please note that this will require some repository layout where bzr-svn
knows where to push the merged revisions to.

Cheers,

Jelmer
--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

Would you tell me something more about requirements for that operation?
"bzr svn-push --merge' always ends with "bzr: ERROR: exceptions.NotImplementedError:"

<STACKTRACE>
bzr: ERROR: exceptions.NotImplementedError:

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 893, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 839, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 539, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/__init__.py", line 416, in run
    _override_svn_revprops=override_svn_revprops)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/branch.py", line 372, in pull
    _override_svn_revprops=_override_svn_revprops)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/branch.py", line 437, in update_revisions
    _push_merged, _override_svn_revprops)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/branch.py", line 448, in _push_missing_revisions
    push_ancestors(self.repository, other.repository, self.layout, self.project, parent_revids, other_graph)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/commit.py", line 928, in push_ancestors
    rhs_branch_path = layout.get_branch_path(nick, project)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/mapping3/__init__.py", line 129, in get_branch_path
    return self.scheme.get_branch_path(name, project)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/mapping3/scheme.py", line 59, in get_branch_path
    raise NotImplementedError
NotImplementedError

bzr 1.10 on python 2.5.1 (linux2)
arguments: ['/usr/bin/bzr', 'svn-push', '--merged', 'svn+https://svnhost/svn/test-repo/test-push-merged']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
  bzrtools /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.10]
  difftools /home/szpak/.bazaar/plugins/difftools [0.91]
  extmerge /home/szpak/.bazaar/plugins/extmerge [unknown]
  gtk /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.94.0.final.1]
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  rebase /usr/lib/python2.5/site-packages/bzrlib/plugins/rebase [0.4.2]
  svn /usr/lib/python2.5/site-packages/bzrlib/plugins/svn [0.4.16]
</STACKTRACE>

Marcin

Is it required to use any special switches during the process of creation a SVN repository or rather have a special directory layout there?

Marcin

On Fri, Jan 09, 2009 at 11:34:27PM -0000, Marcin Zajaczkowski wrote:
> Question #56687 on Bazaar Subversion Plugin changed:
> https://answers.launchpad.net/bzr-svn/+question/56687

> Marcin Zajaczkowski gave more information on the question:
> Is it required to use any special switches during the process of
> creation a SVN repository or rather have a special directory layout
> there?

It is recommended to use the standard SVN layout, e.g. mainline in
/trunk, branches in /branches/* and tags in /tags/*

Cheers,

jelmer

--
Jelmer Vernooij <email address hidden> - http://jelmer.vernstok.nl/
 12:20:13 up 8 days, 15:08, 1 user, load average: 0.21, 1.42, 2.39

Hmm, I don't know if we are talking about the same thing. I would like to see info about merged changes (like below) also in SVN log (could be even pasted in svn commit message) similar to that in bzr log. Is it possible (without manual copy-paste to svn commit message)?

------------------------------------------------------------
revno: 4
committer: marcin
branch nick: trunk/test-remote-svn-branch
timestamp: Fri 2009-01-02 21:30:38 +0100
message:
  Merge first merge
    ------------------------------------------------------------
    revno: 3.1.2
    committer: marcin
    timestamp: Fri 2009-01-02 19:21:36 +0000
    message:
      Some local change
    ------------------------------------------------------------
    revno: 3.1.1
    committer: marcin
    branch nick: test-local-svn-branch-new
    timestamp: Fri 2009-01-02 19:55:24 +0100
    message:
      Another local change

On Sat, Jan 10, 2009 at 06:27:50PM -0000, Marcin Zajaczkowski wrote:
> Question #56687 on Bazaar Subversion Plugin changed:
> https://answers.launchpad.net/bzr-svn/+question/56687

> Status: Answered => Open

> Marcin Zajaczkowski is still having a problem:
> Hmm, I don't know if we are talking about the same thing. I would like
> to see info about merged changes (like below) also in SVN log (could be
> even pasted in svn commit message) similar to that in bzr log. Is it
> possible (without manual copy-paste to svn commit message)?

Ah, ok. If you have svn 1.5, I think that should be able to show the
merged revisions based on the svn:merge file property.

If you would actually like the svn log message to contain the merged
revisions commit messages, that's only possible in bzr-svn 0.5 *in
theory* (the mappings allow for this, it's just not implemented yet).

Cheers,

Jelmer
--
Jelmer Vernooij <email address hidden> - http://jelmer.vernstok.nl/
 23:35:45 up 9 days, 2:23, 1 user, load average: 0.10, 0.11, 0.09

I have only 1.4 on a server. I will make some tests with local Subversion 1.5.

Info in log was proposed only as a backup solution. If 1.5 met my needs it would be ok.

Thanks for your answers.
Marcin