Skip to end of metadata
Go to start of metadata

You are viewing an old version of this page. View the current version.

Compare with Current View Page History

« Previous Version 18 Next »

[00:53:04 EDT(-0400)] * esm (n=esm@207-53-193-206.dynamic-dsl.qis.net) has joined ##uportal
[07:54:27 EDT(-0400)] * esm (n=esm@207-53-193-206.dynamic-dsl.qis.net) has joined ##uportal
[09:07:09 EDT(-0400)] * esm (n=esm@128.220.212.115) has joined ##uportal
[09:14:21 EDT(-0400)] * michelled (n=team@142.150.154.197) has joined ##uportal
[09:35:31 EDT(-0400)] * EiNZTEiN (n=einztein@205.241.143.4) has joined ##uportal
[09:40:39 EDT(-0400)] * anastasiac (n=team@142.150.154.105) has joined ##uportal
[09:47:16 EDT(-0400)] * MarkRogers (n=MarkRoge@addhcp129.cc.umanitoba.ca) has joined ##uportal
[09:53:41 EDT(-0400)] * athena7 (n=athena7@lumina.its.yale.edu) has joined ##uportal
[10:00:22 EDT(-0400)] * EricDalquist (n=dalquist@bohemia.doit.wisc.edu) has joined ##uportal
[10:03:40 EDT(-0400)] * EiNZTEiN (n=einztein@205.241.143.4) has joined ##uportal
[10:22:45 EDT(-0400)] * colinclark (n=colin@142.150.154.101) has joined ##uportal
[10:41:31 EDT(-0400)] * athena7_ (n=athena7@tp-wireless.its.yale.edu) has joined ##uportal
[10:45:08 EDT(-0400)] * colinclark (n=colin@142.150.154.101) has joined ##uportal
[10:58:01 EDT(-0400)] <athena7> what's the best way to replace the trunk in subversion with a branch?
[11:02:27 EDT(-0400)] <EricDalquist> so you have a branch with dev in it
[11:02:32 EDT(-0400)] <EricDalquist> and you want that to 'become' the trunk?
[11:06:58 EDT(-0400)] <athena7> yeah
[11:07:22 EDT(-0400)] <athena7> i wasn't sure what the cleanest way to do that is
[11:07:25 EDT(-0400)] <EricDalquist> so if there are more changes in the branch than can easily be merged, and all of the changes in the trunk are in the branch
[11:07:41 EDT(-0400)] <EricDalquist> you can either move the trunk to a tag or delete it then move the branch to the trunk
[11:08:10 EDT(-0400)] <athena7> ok, yeah, it sounds like in this case we'd want to move to trunk to a branch, then move the branch to the trunk
[11:08:11 EDT(-0400)] <athena7> thanks
[11:08:20 EDT(-0400)] <EricDalquist> yup
[11:24:53 EDT(-0400)] <athena7> so i got xstream reading in the channel publishing documents
[11:26:46 EDT(-0400)] <EricDalquist> neat
[11:27:33 EDT(-0400)] <athena7> yeah i've been pretty happy with xstream so far
[11:27:36 EDT(-0400)] <athena7> it's pretty cool
[11:27:44 EDT(-0400)] <athena7> been playing with the annotations-based stuff

  • No labels