-
https://eris.llnl.gov/svn/slurm/trunkDavid J. Bremer authoredsvn merge https://eris.llnl.gov/svn/slurm/trunk https://eris.llnl.gov/svn/slurm/branches/slurm-1.4.srun.hang I merged changes from the trunk onto slurm-1.4.srun.hang branch as I worked, so the branch was up to date with ongoing trunk development. The merge command above finds the diffs between the trunk and branch--just the development for the branch--and applies the changes to the trunk.
https://eris.llnl.gov/svn/slurm/trunkDavid J. Bremer authoredsvn merge https://eris.llnl.gov/svn/slurm/trunk https://eris.llnl.gov/svn/slurm/branches/slurm-1.4.srun.hang I merged changes from the trunk onto slurm-1.4.srun.hang branch as I worked, so the branch was up to date with ongoing trunk development. The merge command above finds the diffs between the trunk and branch--just the development for the branch--and applies the changes to the trunk.